diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-08 13:35:51 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-08 18:51:44 -0400 |
| commit | 913cdf3be750a1e74c09b20edf55a57f9a919fcc (patch) | |
| tree | 0d2129a167579c0d896bb9213503619b2ef44d1f /modules/input/imti-er.c | |
| parent | 03c19e37af1f7aa9af8a48bcc9dc023397f8693f (diff) | |
| download | gtk+-913cdf3be750a1e74c09b20edf55a57f9a919fcc.tar.gz | |
GDK: Prefix key names with KEY_
The keysyms create a lot of potential namespace conflicts for
C, and are especially problematic for introspection, where we take
constants into the namespace, so GDK_Display conflicts with GdkDisplay.
For C application compatiblity, add gdkkeysyms-compat.h which uses
the old names.
Just one user in GTK+ continues to use gdkkeysyms-compat.h, which is
the gtkimcontextsimple.c, since porting that requires porting more
custom Perl code.
Diffstat (limited to 'modules/input/imti-er.c')
| -rw-r--r-- | modules/input/imti-er.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c index ad623448c7..614755bdb6 100644 --- a/modules/input/imti-er.c +++ b/modules/input/imti-er.c @@ -140,8 +140,8 @@ ti_er_register_type (GTypeModule *module) static guint16 ti_er_compose_seqs[] = { /* do punctuation and numerals here */ - '\'', 0, 0, 0, 0, 0, GDK_dead_grave, /* hopefully this has no side effects */ - '\'', '\'', 0, 0, 0, 0, GDK_apostrophe, + '\'', 0, 0, 0, 0, 0, GDK_KEY_dead_grave, /* hopefully this has no side effects */ + '\'', '\'', 0, 0, 0, 0, GDK_KEY_apostrophe, '\'', '1', 0, 0, 0, 0, 0x1369, '\'', '1', '0', 0, 0, 0, 0x1372, '\'', '1', '0', '0', 0, 0, 0x137b, @@ -430,8 +430,8 @@ static guint16 ti_er_compose_seqs[] = { SYLW('x', 0x1238) SYL('y', 0x12e8) SYLW('z', 0x12d8) - GDK_Shift_L, GDK_space, 0, 0, 0, 0, 0x1361, - GDK_Shift_R, GDK_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_L, GDK_KEY_space, 0, 0, 0, 0, 0x1361, + GDK_KEY_Shift_R, GDK_KEY_space, 0, 0, 0, 0, 0x1361, }; static void |