diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-27 00:42:29 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-27 00:42:29 +0000 |
| commit | fefbd217fefe5e29d7913e58ff8b1bc9d8d44939 (patch) | |
| tree | 0fc16570bde5385eeb4933224cdfff67532bf4c4 /src/widgets | |
| parent | Adding cout << output to check bug in Geom::are_near (diff) | |
| parent | Changed some return types from gint to bool. (diff) | |
| download | inkscape-fefbd217fefe5e29d7913e58ff8b1bc9d8d44939.tar.gz inkscape-fefbd217fefe5e29d7913e58ff8b1bc9d8d44939.zip | |
update to trunk
(bzr r11950.1.315)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/connector-toolbar.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/pencil-toolbar.cpp | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp index a0965721f..9bbc1bbb4 100644 --- a/src/widgets/connector-toolbar.cpp +++ b/src/widgets/connector-toolbar.cpp @@ -28,12 +28,15 @@ # include "config.h" #endif +#include <glibmm/i18n.h> + #include "connector-toolbar.h" #include "conn-avoid-ref.h" #include "desktop-handles.h" #include "desktop.h" #include "document-undo.h" #include "ege-adjustment-action.h" +#include "enums.h" #include "graphlayout.h" #include "ink-action.h" #include "inkscape.h" diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index 20fb43e42..772107101 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -73,16 +73,8 @@ static void freehand_mode_changed(EgeSelectOneAction* act, GObject* tbl) // in pen tool we have more options than in pencil tool; if one of them was chosen, we do any // preparatory work here - //if (SP_IS_PEN_CONTEXT(desktop->event_context)) { - // Inkscape::UI::Tools::PenTool *pc = SP_PEN_CONTEXT(desktop->event_context); - // sp_pen_context_set_polyline_mode(pc); - //} - - using namespace Inkscape::UI; - using Inkscape::UI::Tools::PenTool; - - if (Tool::is_a<PenTool>(desktop->event_context)) { - PenTool* pc = Tool::to<PenTool>(desktop->event_context); + if (SP_IS_PEN_CONTEXT(desktop->event_context)) { + Inkscape::UI::Tools::PenTool *pc = SP_PEN_CONTEXT(desktop->event_context); pc->setPolylineMode(); } } |