diff options
| author | Denis Declara <declara91@gmail.com> | 2012-04-15 12:29:45 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-04-15 12:29:45 +0000 |
| commit | 6b5ff661a46ea1779c86f6947006c5ed32926117 (patch) | |
| tree | a5b170f0830854e99ad065055ee2a3996933e614 /src/knot.cpp | |
| parent | Improved User interface. (diff) | |
| parent | i18n. Fix for Bug #980518 (Please use c-format). (diff) | |
| download | inkscape-6b5ff661a46ea1779c86f6947006c5ed32926117.tar.gz inkscape-6b5ff661a46ea1779c86f6947006c5ed32926117.zip | |
Trunk merge
(bzr r11073.1.15)
Diffstat (limited to 'src/knot.cpp')
| -rw-r--r-- | src/knot.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/knot.cpp b/src/knot.cpp index aee4fe1a5..770618470 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -36,6 +36,10 @@ using Inkscape::DocumentUndo; GDK_POINTER_MOTION_HINT_MASK | \ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) +#if !GTK_CHECK_VERSION(2,22,0) +#define GDK_KEY_Escape 0xff1b +#endif + static bool nograb = false; static bool grabbed = FALSE; @@ -189,7 +193,7 @@ static void sp_knot_init(SPKnot *knot) knot->size = 8; knot->pos = Geom::Point(0, 0); knot->grabbed_rel_pos = Geom::Point(0, 0); - knot->anchor = GTK_ANCHOR_CENTER; + knot->anchor = SP_ANCHOR_CENTER; knot->shape = SP_KNOT_SHAPE_SQUARE; knot->mode = SP_KNOT_MODE_XOR; knot->tip = NULL; @@ -241,7 +245,11 @@ static void sp_knot_dispose(GObject *object) for (gint i = 0; i < SP_KNOT_VISIBLE_STATES; i++) { if (knot->cursor[i]) { +#if GTK_CHECK_VERSION(3,0,0) + g_object_unref(knot->cursor[i]); +#else gdk_cursor_unref(knot->cursor[i]); +#endif knot->cursor[i] = NULL; } } @@ -411,7 +419,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot break; case GDK_KEY_PRESS: // keybindings for knot switch (get_group0_keyval(&event->key)) { - case GDK_Escape: + case GDK_KEY_Escape: sp_knot_set_flag(knot, SP_KNOT_GRABBED, FALSE); if (!nograb) { sp_canvas_item_ungrab(knot->item, event->button.time); @@ -472,7 +480,7 @@ SPKnot *sp_knot_new(SPDesktop *desktop, const gchar *tip) knot->item = sp_canvas_item_new(sp_desktop_controls (desktop), SP_TYPE_CTRL, - "anchor", GTK_ANCHOR_CENTER, + "anchor", SP_ANCHOR_CENTER, "size", 8.0, "filled", TRUE, "fill_color", 0xffffff00, |