From b15a1b0f69711ff3a82a25b3aacfffbbb94df0ff Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 10 Apr 2012 11:38:21 +0100 Subject: Adopt obsolete GtkAnchorType enum as SPAnchorType (bzr r11207) --- src/ui/tool/control-point.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/ui/tool/control-point.cpp') diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp index 8525e92f4..a5509655f 100644 --- a/src/ui/tool/control-point.cpp +++ b/src/ui/tool/control-point.cpp @@ -132,7 +132,7 @@ ControlPoint::ColorSet invisible_cset = { * @param group The canvas group the point's canvas item should be created in */ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, - Gtk::AnchorType anchor, SPCtrlShapeType shape, + SPAnchorType anchor, SPCtrlShapeType shape, unsigned int size, ColorSet *cset, SPCanvasGroup *group) : _desktop (d) , _canvas_item (NULL) @@ -142,7 +142,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, { _canvas_item = sp_canvas_item_new( group ? group : sp_desktop_controls (_desktop), SP_TYPE_CTRL, - "anchor", (GtkAnchorType) anchor, "size", (gdouble) size, "shape", shape, + "anchor", (SPAnchorType) anchor, "size", (gdouble) size, "shape", shape, "filled", TRUE, "fill_color", _cset->normal.fill, "stroked", TRUE, "stroke_color", _cset->normal.stroke, "mode", SP_CTRL_MODE_XOR, NULL); @@ -160,7 +160,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, * @param group The canvas group the point's canvas item should be created in */ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, - Gtk::AnchorType anchor, Glib::RefPtr pixbuf, + SPAnchorType anchor, Glib::RefPtr pixbuf, ColorSet *cset, SPCanvasGroup *group) : _desktop (d) , _canvas_item (NULL) @@ -169,7 +169,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, { _canvas_item = sp_canvas_item_new( group ? group : sp_desktop_controls(_desktop), SP_TYPE_CTRL, - "anchor", (GtkAnchorType) anchor, "size", (gdouble) pixbuf->get_width(), + "anchor", (SPAnchorType) anchor, "size", (gdouble) pixbuf->get_width(), "shape", SP_CTRL_SHAPE_BITMAP, "pixbuf", pixbuf->gobj(), "filled", TRUE, "fill_color", _cset->normal.fill, "stroked", TRUE, "stroke_color", _cset->normal.stroke, @@ -262,9 +262,9 @@ SPCtrlShapeType ControlPoint::_shape() const return ret; } -GtkAnchorType ControlPoint::_anchor() const +SPAnchorType ControlPoint::_anchor() const { - GtkAnchorType ret; + SPAnchorType ret; g_object_get(_canvas_item, "anchor", &ret, NULL); return ret; } @@ -288,7 +288,7 @@ void ControlPoint::_setShape(SPCtrlShapeType shape) g_object_set(_canvas_item, "shape", shape, NULL); } -void ControlPoint::_setAnchor(GtkAnchorType anchor) +void ControlPoint::_setAnchor(SPAnchorType anchor) { g_object_set(_canvas_item, "anchor", anchor, NULL); } -- cgit v1.2.3 From 0024197c76bca50d557edc2824646a636d695c4d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 15 Apr 2012 01:17:25 +0100 Subject: Get rid of remaining deprecated GDK Key symbols (bzr r11250) --- src/ui/tool/control-point.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/ui/tool/control-point.cpp') diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp index a5509655f..15af21777 100644 --- a/src/ui/tool/control-point.cpp +++ b/src/ui/tool/control-point.cpp @@ -27,6 +27,12 @@ #include "ui/tool/event-utils.h" #include "ui/tool/transform-handle-set.h" +#if !GTK_CHECK_VERSION(2,22,0) +#define GDK_KEY_Escape 0xff1b +#define GDK_KEY_Tab 0xff09 +#define GDK_KEY_ISO_Left_Tab 0xfe20 +#endif + namespace Inkscape { namespace UI { @@ -440,7 +446,7 @@ bool ControlPoint::_eventHandler(SPEventContext *event_context, GdkEvent *event) case GDK_KEY_PRESS: switch (get_group0_keyval(&event->key)) { - case GDK_Escape: { + case GDK_KEY_Escape: { // ignore Escape if this is not a drag if (!_drag_initiated) break; @@ -480,7 +486,7 @@ bool ControlPoint::_eventHandler(SPEventContext *event_context, GdkEvent *event) ungrabbed(NULL); // ungrabbed handlers can handle a NULL event snapprefs.setSnapEnabledGlobally(snap_save); } return true; - case GDK_Tab: + case GDK_KEY_Tab: {// Downcast from ControlPoint to TransformHandle, if possible // This is an ugly hack; we should have the transform handle intercept the keystrokes itself TransformHandle *th = dynamic_cast(this); @@ -490,7 +496,7 @@ bool ControlPoint::_eventHandler(SPEventContext *event_context, GdkEvent *event) } break; } - case GDK_ISO_Left_Tab: + case GDK_KEY_ISO_Left_Tab: {// Downcast from ControlPoint to TransformHandle, if possible // This is an ugly hack; we should have the transform handle intercept the keystrokes itself TransformHandle *th = dynamic_cast(this); -- cgit v1.2.3