diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-28 01:34:05 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-28 01:34:05 +0000 |
| commit | 8343d5b99fd87292e2e536bfbe7c50f26bb6d149 (patch) | |
| tree | 564a2c053c6dac374ba0e021000efe1a3bcc45c1 /src/widgets | |
| parent | Small performance and bug fixes (diff) | |
| parent | Changed some return types from gint to bool. (diff) | |
| download | inkscape-8343d5b99fd87292e2e536bfbe7c50f26bb6d149.tar.gz inkscape-8343d5b99fd87292e2e536bfbe7c50f26bb6d149.zip | |
Update to trunk
Fix nearly every issue with Join Types and Taper Stroke
(bzr r13090.1.34)
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 6598e995a..682de8594 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(); } } |