diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-13 00:00:04 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-13 00:00:04 +0000 |
| commit | 152a0caf7e216e7ceafeed20822500c385e3e2df (patch) | |
| tree | a3b5d60e08f3bd8221ba2e50eea80b087e5d541a /src/ui/widget | |
| parent | Update to trunk (diff) | |
| parent | fix C++11 compilation. There A LOT of const_casts in this file... :-( (diff) | |
| download | inkscape-152a0caf7e216e7ceafeed20822500c385e3e2df.tar.gz inkscape-152a0caf7e216e7ceafeed20822500c385e3e2df.zip | |
Update to trunk
(bzr r12588.1.26)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/rotateable.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 6 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.h | 3 | ||||
| -rw-r--r-- | src/ui/widget/spinbutton.cpp | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp index 18d53bf5c..72ec69362 100644 --- a/src/ui/widget/rotateable.cpp +++ b/src/ui/widget/rotateable.cpp @@ -19,7 +19,7 @@ #include <gtkmm/eventbox.h> #include <glibmm/i18n.h> #include <2geom/point.h> -#include "event-context.h" +#include "ui/tools/tool-base.h" #include "rotateable.h" namespace Inkscape { @@ -111,7 +111,7 @@ bool Rotateable::on_motion(GdkEventMotion *event) { do_motion(force, modifier); } } - gobble_motion_events(GDK_BUTTON1_MASK); + Inkscape::UI::Tools::gobble_motion_events(GDK_BUTTON1_MASK); return true; } return false; diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 3a6b0c7df..aa617353c 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -39,7 +39,7 @@ #include "sp-gradient.h" #include "svg/svg-color.h" #include "svg/css-ostringstream.h" -#include "event-context.h" +#include "ui/tools/tool-base.h" #include "message-context.h" #include "verbs.h" #include "color.h" @@ -1439,9 +1439,7 @@ RotateableStrokeWidth::RotateableStrokeWidth(SelectedStyle *parent) : parent(parent), startvalue(0), startvalue_set(false), - undokey("swrot1"), - cr(0), - cr_set(false) + undokey("swrot1") { } diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h index 21e5575ed..9557a8d74 100644 --- a/src/ui/widget/selected-style.h +++ b/src/ui/widget/selected-style.h @@ -115,9 +115,6 @@ private: bool startvalue_set; gchar const *undokey; - - GdkCursor *cr; - bool cr_set; }; /** diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp index 6cbc15c1b..7709a837b 100644 --- a/src/ui/widget/spinbutton.cpp +++ b/src/ui/widget/spinbutton.cpp @@ -16,7 +16,7 @@ #include "unit-menu.h" #include "unit-tracker.h" #include "util/expression-evaluator.h" -#include "event-context.h" +#include "ui/tools/tool-base.h" namespace Inkscape { namespace UI { @@ -71,7 +71,7 @@ bool SpinButton::on_my_focus_in_event(GdkEventFocus* /*event*/) bool SpinButton::on_my_key_press_event(GdkEventKey* event) { - switch (get_group0_keyval (event)) { + switch (Inkscape::UI::Tools::get_group0_keyval (event)) { case GDK_KEY_Escape: undo(); return true; // I consumed the event |