diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-08 01:57:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-08 01:57:36 +0000 |
| commit | 3b2966fe4bce6752e47c9180828a628d027d2715 (patch) | |
| tree | e403f77747f8cebd523a48b3a7f7b4a3164254a6 /src/verbs.cpp | |
| parent | Update to trunk (diff) | |
| parent | First step of moving tools into appropriate namespaces. (diff) | |
| download | inkscape-3b2966fe4bce6752e47c9180828a628d027d2715.tar.gz inkscape-3b2966fe4bce6752e47c9180828a628d027d2715.zip | |
Update to trunk
(bzr r11950.1.193)
Diffstat (limited to 'src/verbs.cpp')
| -rw-r--r-- | src/verbs.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/verbs.cpp b/src/verbs.cpp index bdef0526a..4bcfd39fe 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1473,7 +1473,7 @@ void ObjectVerb::perform( SPAction *action, void *data) g_return_if_fail(ensure_desktop_valid(action)); - SPEventContext *ec = dt->event_context; + Inkscape::UI::Tools::ToolBase *ec = dt->event_context; if (sel->isEmpty()) return; @@ -1622,7 +1622,7 @@ void ContextVerb::perform(SPAction *action, void *data) tools_switch(dt, TOOLS_MEASURE); break; case SP_VERB_CONTEXT_DROPPER: - sp_toggle_dropper(dt); // Functionality defined in event-context.cpp + Inkscape::UI::Tools::sp_toggle_dropper(dt); // Functionality defined in event-context.cpp break; case SP_VERB_CONTEXT_CONNECTOR: tools_switch(dt, TOOLS_CONNECTOR); @@ -1767,7 +1767,7 @@ void ZoomVerb::perform(SPAction *action, void *data) { g_return_if_fail(ensure_desktop_valid(action)); SPDesktop *dt = sp_action_get_desktop(action); - SPEventContext *ec = dt->event_context; + Inkscape::UI::Tools::ToolBase *ec = dt->event_context; SPDocument *doc = sp_desktop_document(dt); @@ -1780,7 +1780,7 @@ void ZoomVerb::perform(SPAction *action, void *data) switch (reinterpret_cast<std::size_t>(data)) { case SP_VERB_ZOOM_IN: { - gint mul = 1 + gobble_key_events( + gint mul = 1 + Inkscape::UI::Tools::gobble_key_events( GDK_KEY_KP_Add, 0); // with any mask // While drawing with the pen/pencil tool, zoom towards the end of the unfinished path if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) { @@ -1798,7 +1798,7 @@ void ZoomVerb::perform(SPAction *action, void *data) } case SP_VERB_ZOOM_OUT: { - gint mul = 1 + gobble_key_events( + gint mul = 1 + Inkscape::UI::Tools::gobble_key_events( GDK_KEY_KP_Subtract, 0); // with any mask // While drawing with the pen/pencil tool, zoom away from the end of the unfinished path if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) { |