diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-10 02:08:46 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-10 02:08:46 +0000 |
| commit | ca1286aa677b5ff8d80fe274dfa3e759478570b3 (patch) | |
| tree | 36c7edfa575cea3d3bddfc4b034f7a35a8374ade /src/ui/tools/pencil-tool.cpp | |
| parent | Fixing bugs on update to trunk (diff) | |
| parent | Revert unintentional change. (diff) | |
| download | inkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.tar.gz inkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.zip | |
Update to trunk
(bzr r11950.1.195)
Diffstat (limited to '')
| -rw-r--r-- | src/ui/tools/pencil-tool.cpp (renamed from src/pencil-context.cpp) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pencil-context.cpp b/src/ui/tools/pencil-tool.cpp index 57377a5ed..ff14d61ec 100644 --- a/src/pencil-context.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -18,7 +18,7 @@ #include <gdk/gdkkeysyms.h> -#include "pencil-context.h" +#include "ui/tools/pencil-tool.h" #include "desktop.h" #include "desktop-handles.h" #include "selection.h" @@ -84,7 +84,7 @@ const std::string& PencilTool::getPrefsPath() { const std::string PencilTool::prefsPath = "/tools/freehand/pencil"; PencilTool::PencilTool() : - SPDrawContext(), + FreehandBase(), p(), npoints(0), state(SP_PENCIL_CONTEXT_IDLE), @@ -105,7 +105,7 @@ void PencilTool::setup() { this->enableSelectionCue(); } - SPDrawContext::setup(); + FreehandBase::setup(); this->is_drawing = false; this->anchor_statusbar = false; @@ -164,7 +164,7 @@ bool PencilTool::root_handler(GdkEvent* event) { } if (!ret) { - ret = SPDrawContext::root_handler(event); + ret = FreehandBase::root_handler(event); } return ret; @@ -177,7 +177,7 @@ pencil_handle_button_press(PencilTool *const pc, GdkEventButton const &bevent) ToolBase *event_context = SP_EVENT_CONTEXT(pc); if ( bevent.button == 1 && !event_context->space_panning) { - SPDrawContext *dc = SP_DRAW_CONTEXT (pc); + FreehandBase *dc = SP_DRAW_CONTEXT (pc); SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc); Inkscape::Selection *selection = sp_desktop_selection(desktop); |