Mercurial > hg > xemacs-beta
comparison src/console-gtk-impl.h @ 2054:91d4c8c65a0f
[xemacs-hg @ 2004-05-02 04:06:51 by malcolmp]
Fix warnings and errors when building GTK using C++ and --use-union-type.
author | malcolmp |
---|---|
date | Sun, 02 May 2004 04:07:01 +0000 |
parents | 01c57eb70ae9 |
children | 95fee4a1420e |
comparison
equal
deleted
inserted
replaced
2053:11e709117623 | 2054:91d4c8c65a0f |
---|---|
35 | 35 |
36 #ifdef HAVE_GTK | 36 #ifdef HAVE_GTK |
37 | 37 |
38 #include "console-impl.h" | 38 #include "console-impl.h" |
39 #include "console-gtk.h" | 39 #include "console-gtk.h" |
40 #include <X11/Xlib.h> | |
40 | 41 |
41 #define GDK_DRAWABLE(x) (GdkDrawable *) (x) | 42 #define GDK_DRAWABLE(x) (GdkDrawable *) (x) |
42 #define GET_GTK_WIDGET_WINDOW(x) (GTK_WIDGET (x)->window) | 43 #define GET_GTK_WIDGET_WINDOW(x) (GTK_WIDGET (x)->window) |
43 #define GET_GTK_WIDGET_PARENT(x) (GTK_WIDGET (x)->parent) | 44 #define GET_GTK_WIDGET_PARENT(x) (GTK_WIDGET (x)->parent) |
44 | 45 |
64 one of these per device. */ | 65 one of these per device. */ |
65 Lisp_Object WM_COMMAND_frame; | 66 Lisp_Object WM_COMMAND_frame; |
66 | 67 |
67 /* The following items are all used exclusively in event-gtk.c. */ | 68 /* The following items are all used exclusively in event-gtk.c. */ |
68 int MetaMask, HyperMask, SuperMask, AltMask, ModeMask; | 69 int MetaMask, HyperMask, SuperMask, AltMask, ModeMask; |
69 guint lock_interpretation; | 70 KeySym lock_interpretation; |
70 | 71 |
71 void *x_modifier_keymap; /* Really an (XModifierKeymap *)*/ | 72 XModifierKeymap *x_modifier_keymap; |
72 | 73 |
73 guint *x_keysym_map; | 74 KeySym *x_keysym_map; |
74 int x_keysym_map_min_code; | 75 int x_keysym_map_min_code; |
75 int x_keysym_map_max_code; | 76 int x_keysym_map_max_code; |
76 int x_keysym_map_keysyms_per_code; | 77 int x_keysym_map_keysyms_per_code; |
77 Lisp_Object x_keysym_map_hashtable; | 78 Lisp_Object x_keysym_map_hashtable; |
78 | 79 |