diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-18 06:39:59 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-18 06:39:59 +0800 |
| commit | afe6f502c326350cc31d34646d5000a964321525 (patch) | |
| tree | 9d9469a0ce33428e24e602fdbf87bc496864bc57 /widgets/text | |
| parent | b79bf3d187cabd11df74d2e6e414e41ae637f307 (diff) | |
| download | gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.gz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.bz2 gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.lz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.xz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.zst gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.zip | |
Use new GDK keysym names if available.
In GTK+ 2.21.8, the keysym names were renamed from GDK_* to GDK_KEY_*.
I've added backward-compatibility macors to gtk-compat.h, which can be
dumped as soon as we require GTK+ >= 2.22.0.
Diffstat (limited to 'widgets/text')
| -rw-r--r-- | widgets/text/e-reflow.c | 2 | ||||
| -rw-r--r-- | widgets/text/e-text.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c index 7a0f7ad121..99b35f9225 100644 --- a/widgets/text/e-reflow.c +++ b/widgets/text/e-reflow.c @@ -927,7 +927,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) break; #if 0 if (event->key.keyval == GDK_Tab || - event->key.keyval == GDK_KP_Tab || + event->key.keyval == GDK_KEY_KP_Tab || event->key.keyval == GDK_ISO_Left_Tab) { gint i; gint count; diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 979cae72e0..67e29a84be 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -53,10 +53,12 @@ #include <glib/gi18n.h> #include "e-util/e-text-event-processor-emacs-like.h" #include "e-util/e-util.h" -#include "e-util/gtk-compat.h" #include "e-text.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + G_DEFINE_TYPE (EText, e_text, GNOME_TYPE_CANVAS_ITEM) #define BORDER_INDENT 3 @@ -2113,7 +2115,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) /* Handle S-F10 key binding here. */ - if (event->key.keyval == GDK_F10 + if (event->key.keyval == GDK_KEY_F10 && (event->key.state & GDK_SHIFT_MASK) && text->handle_popup ) { |