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/widgets/mesh-toolbar.cpp | |
| 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/widgets/mesh-toolbar.cpp')
| -rw-r--r-- | src/widgets/mesh-toolbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp index 582243870..15dda94f0 100644 --- a/src/widgets/mesh-toolbar.cpp +++ b/src/widgets/mesh-toolbar.cpp @@ -41,7 +41,7 @@ #include "desktop-handles.h" #include <glibmm/i18n.h> -#include "gradient-context.h" +#include "ui/tools/gradient-tool.h" #include "gradient-drag.h" #include "sp-mesh-gradient.h" #include "gradient-chemistry.h" @@ -59,7 +59,7 @@ #include "svg/css-ostringstream.h" #include "svg/svg-color.h" #include "desktop-style.h" -#include "gradient-context.h" +#include "ui/tools/gradient-tool.h" #include "toolbox.h" @@ -94,7 +94,7 @@ static void ms_tb_selection_changed(Inkscape::Selection * /*selection*/, gpointe // Inkscape::Selection *selection = sp_desktop_selection(desktop); // take from desktop, not from args // if (selection) { - // SPEventContext *ev = sp_desktop_event_context(desktop); + // ToolBase *ev = sp_desktop_event_context(desktop); // GrDrag *drag = NULL; // if (ev) { // drag = ev->get_drag(); |