diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-04 22:38:29 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-04 22:38:29 +0000 |
| commit | ad56baec4315d4059d3a99a796f60e3df9659964 (patch) | |
| tree | 0b3f1c6d347690aa5d3082e254385909f973216e /src/ui/widget | |
| parent | Merge branch 'master' into fixSpinButtonAndSliderInLPE (diff) | |
| download | inkscape-ad56baec4315d4059d3a99a796f60e3df9659964.tar.gz inkscape-ad56baec4315d4059d3a99a796f60e3df9659964.zip | |
Working on compiling on linux problem
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/registered-widget.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/scalar.cpp | 3 | ||||
| -rw-r--r-- | src/ui/widget/scalar.h | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 26f93ba7f..78de055de 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -12,11 +12,11 @@ #ifndef INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_ #define INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_ -#include "ui/widget/scalar.h" #include <2geom/affine.h> #include "xml/node.h" #include "registry.h" +#include "ui/widget/scalar.h" #include "ui/widget/scalar-unit.h" #include "ui/widget/point.h" #include "ui/widget/text.h" diff --git a/src/ui/widget/scalar.cpp b/src/ui/widget/scalar.cpp index 4d0edeac3..a0f1354a3 100644 --- a/src/ui/widget/scalar.cpp +++ b/src/ui/widget/scalar.cpp @@ -14,6 +14,7 @@ # include <config.h> #endif + #include "scalar.h" #include "spinbutton.h" #include <gtkmm/scale.h> @@ -29,7 +30,6 @@ Scalar::Scalar(Glib::ustring const &label, Glib::ustring const &tooltip, : Labelled(label, tooltip, new SpinButton(), suffix, icon, mnemonic), setProgrammatically(false) { - } Scalar::Scalar(Glib::ustring const &label, Glib::ustring const &tooltip, @@ -154,6 +154,7 @@ Glib::SignalProxy<bool, GdkEventButton*> Scalar::signal_button_release_event() return static_cast<SpinButton*>(_widget)->signal_button_release_event(); } + } // namespace Widget } // namespace UI } // namespace Inkscape diff --git a/src/ui/widget/scalar.h b/src/ui/widget/scalar.h index 80acaba0e..80de5166d 100644 --- a/src/ui/widget/scalar.h +++ b/src/ui/widget/scalar.h @@ -78,6 +78,7 @@ public: Glib::ustring const &suffix = "", Glib::ustring const &icon = "", bool mnemonic = true); + /** * Fetches the precision of the spin buton. */ @@ -150,10 +151,12 @@ public: * Signal raised when the spin button's value changes. */ Glib::SignalProxy0<void> signal_value_changed(); + /** * Signal raised when the spin button's pressed. */ - Glib::SignalProxy< bool, GdkEventButton* > signal_button_release_event(); + Glib::SignalProxy<bool, GdkEventButton*> signal_button_release_event(); + /** * true if the value was set by setValue, not changed by the user; * if a callback checks it, it must reset it back to false. |