callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GDK: Prefix key names with KEY_

Browse Source 
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.
This commit is contained in:
Colin Walters
2010-09-08 13:35:51 -04:00
parent 03c19e37af
commit 913cdf3be7
62 changed files with 5503 additions and 3255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/input/imti-et.c
View File

@ -140,8 +140,8 @@ ti_et_register_type (GTypeModule *module)
static guint16 ti_et_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_et_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