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/main.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/main.cpp')
| -rw-r--r-- | src/main.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4bf327284..7a5d15cb7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -117,6 +117,11 @@ #include <gdk/gdkkeysyms.h> +#if !GTK_CHECK_VERSION(2,22,0) +#define GDK_KEY_Alt_L 0xffe9 +#define GDK_KEY_Alt_R 0xffea +#endif + enum { SP_ARG_NONE, SP_ARG_NOGUI, @@ -889,8 +894,8 @@ snooper(GdkEvent *event, gpointer /*data*/) { break; case GDK_KEY_PRESS: keyval = get_group0_keyval(&event->key); - if (keyval == GDK_Alt_L) altL_pressed = TRUE; - if (keyval == GDK_Alt_R) altR_pressed = TRUE; + if (keyval == GDK_KEY_Alt_L) altL_pressed = TRUE; + if (keyval == GDK_KEY_Alt_R) altR_pressed = TRUE; alt_pressed = alt_pressed || altL_pressed || altR_pressed; alt_pressed = alt_pressed || (event->button.state & GDK_MOD1_MASK); if (alt_pressed) @@ -900,8 +905,8 @@ snooper(GdkEvent *event, gpointer /*data*/) { break; case GDK_KEY_RELEASE: keyval = get_group0_keyval(&event->key); - if (keyval == GDK_Alt_L) altL_pressed = FALSE; - if (keyval == GDK_Alt_R) altR_pressed = FALSE; + if (keyval == GDK_KEY_Alt_L) altL_pressed = FALSE; + if (keyval == GDK_KEY_Alt_R) altR_pressed = FALSE; if (!altL_pressed && !altR_pressed) alt_pressed = FALSE; break; |