diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-08 00:17:30 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-08 00:17:30 +0000 |
| commit | 736d7a269f58740a3c724914abc016542f05a16c (patch) | |
| tree | a982dbbcd974402473ba312eef7be696aa043d04 /src/connector-context.cpp | |
| parent | circle tool: fix shift click to reset to full circle for start angle node (diff) | |
| download | inkscape-736d7a269f58740a3c724914abc016542f05a16c.tar.gz inkscape-736d7a269f58740a3c724914abc016542f05a16c.zip | |
More GDK key macro fixes, and some cursor referencing
(bzr r11180)
Diffstat (limited to 'src/connector-context.cpp')
| -rw-r--r-- | src/connector-context.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/connector-context.cpp b/src/connector-context.cpp index 1c631c446..cf8d73bd2 100644 --- a/src/connector-context.cpp +++ b/src/connector-context.cpp @@ -194,6 +194,13 @@ using Inkscape::DocumentUndo; +#if !GTK_CHECK_VERSION(2,22,0) +#define GDK_KEY_Return 0xff0d +#define GDK_KEY_KP_Enter 0xff8d +#define GDK_KEY_Escape 0xff1b +#define GDK_KEY_Delete 0xffff +#endif + static void sp_connector_context_class_init(SPConnectorContextClass *klass); static void sp_connector_context_init(SPConnectorContext *conn_context); static void sp_connector_context_dispose(GObject *object); @@ -1156,15 +1163,15 @@ connector_handle_key_press(SPConnectorContext *const cc, guint const keyval) if ( cc->mode == SP_CONNECTOR_CONTEXT_DRAWING_MODE ) { switch (keyval) { - case GDK_Return: - case GDK_KP_Enter: + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: if (cc->npoints != 0) { spcc_connector_finish(cc); cc->state = SP_CONNECTOR_CONTEXT_IDLE; ret = TRUE; } break; - case GDK_Escape: + case GDK_KEY_Escape: if (cc->state == SP_CONNECTOR_CONTEXT_REROUTING) { SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc); @@ -1195,7 +1202,7 @@ connector_handle_key_press(SPConnectorContext *const cc, guint const keyval) switch ( cc->state ) { case SP_CONNECTOR_CONTEXT_DRAGGING: - if ( keyval == GDK_Escape ) + if ( keyval == GDK_KEY_Escape ) { // Cancel connection point dragging @@ -1209,7 +1216,7 @@ connector_handle_key_press(SPConnectorContext *const cc, guint const keyval) _("Connection point drag cancelled.")); ret = TRUE; } - else if ( keyval == GDK_Return || keyval == GDK_KP_Enter ) + else if ( keyval == GDK_KEY_Return || keyval == GDK_KEY_KP_Enter ) { // Put connection point at current position @@ -1233,7 +1240,7 @@ connector_handle_key_press(SPConnectorContext *const cc, guint const keyval) } break; case SP_CONNECTOR_CONTEXT_NEWCONNPOINT: - if ( keyval == GDK_Escape ) + if ( keyval == GDK_KEY_Escape ) { // Just destroy the knot g_object_unref( cc->selected_handle ); @@ -1241,7 +1248,7 @@ connector_handle_key_press(SPConnectorContext *const cc, guint const keyval) cc->state = SP_CONNECTOR_CONTEXT_IDLE; ret = TRUE; } - else if ( keyval == GDK_Return || keyval == GDK_KP_Enter ) + else if ( keyval == GDK_KEY_Return || keyval == GDK_KEY_KP_Enter ) { SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc); SPDocument *doc = sp_desktop_document(desktop); @@ -1272,7 +1279,7 @@ connector_handle_key_press(SPConnectorContext *const cc, guint const keyval) break; case SP_CONNECTOR_CONTEXT_IDLE: - if ( keyval == GDK_Delete && cc->selected_handle ) + if ( keyval == GDK_KEY_Delete && cc->selected_handle ) { cc->active_shape->avoidRef->deleteConnectionPoint(cc->connpthandles[cc->selected_handle]); cc->selected_handle = NULL; |