Mercurial > hg > xemacs-beta

comparison src/console-gtk-impl.h @ 5118:e0db3c197671 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 141c2920ea48
children d1247f3cc363
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
47 47
48 DECLARE_CONSOLE_TYPE (gtk); 48 DECLARE_CONSOLE_TYPE (gtk);
49 49
50 struct gtk_device 50 struct gtk_device
51 { 51 {
52 #ifdef NEW_GC
53 struct lrecord_header header;
54 #endif /* NEW_GC */
52 /* Gtk application info. */ 55 /* Gtk application info. */
53 GtkWidget *gtk_app_shell; 56 GtkWidget *gtk_app_shell;
54 57
55 /* Cache of GC's for frame's on this device. */ 58 /* Cache of GC's for frame's on this device. */
56 struct gc_cache *gc_cache; 59 struct gc_cache *gc_cache;
106 unsigned int need_to_add_mask, down_mask; 109 unsigned int need_to_add_mask, down_mask;
107 KeyCode last_downkey; 110 KeyCode last_downkey;
108 guint32 release_time; 111 guint32 release_time;
109 #endif 112 #endif
110 }; 113 };
114
115 #ifdef NEW_GC
116 typedef struct gtk_device Lisp_Gtk_Device;
117
118 DECLARE_LISP_OBJECT (gtk_device, Lisp_Gtk_Device);
119
120 #define XGTK_DEVICE(x) \
121 XRECORD (x, gtk_device, Lisp_Gtk_Device)
122 #define wrap_gtk_device(p) wrap_record (p, gtk_device)
123 #define GTK_DEVICE_P(x) RECORDP (x, gtk_device)
124 #endif /* NEW_GC */
111 125
112 #define DEVICE_GTK_DATA(d) DEVICE_TYPE_DATA (d, gtk) 126 #define DEVICE_GTK_DATA(d) DEVICE_TYPE_DATA (d, gtk)
113 127
114 #define DEVICE_GTK_VISUAL(d) (DEVICE_GTK_DATA (d)->visual) 128 #define DEVICE_GTK_VISUAL(d) (DEVICE_GTK_DATA (d)->visual)
115 #define DEVICE_GTK_DEPTH(d) (DEVICE_GTK_DATA (d)->depth) 129 #define DEVICE_GTK_DEPTH(d) (DEVICE_GTK_DATA (d)->depth)
127 displayed (menubar, psheet, debugger panel). */ 141 displayed (menubar, psheet, debugger panel). */
128 #define MAX_CONCURRENT_TOP_WIDGETS 8 142 #define MAX_CONCURRENT_TOP_WIDGETS 8
129 143
130 struct gtk_frame 144 struct gtk_frame
131 { 145 {
146 #ifdef NEW_GC
147 struct lrecord_header header;
148 #endif /* NEW_GC */
149
132 /* The widget of this frame. */ 150 /* The widget of this frame. */
133 GtkWidget *widget; /* This is really a GtkWindow */ 151 GtkWidget *widget; /* This is really a GtkWindow */
134 152
135 /* The layout manager */ 153 /* The layout manager */
136 GtkWidget *container; /* actually a GtkVBox. */ 154 GtkWidget *container; /* actually a GtkVBox. */
180 Lisp_Object widget_instance_hash_table; 198 Lisp_Object widget_instance_hash_table;
181 Lisp_Object widget_callback_hash_table; 199 Lisp_Object widget_callback_hash_table;
182 Lisp_Object widget_callback_ex_hash_table; 200 Lisp_Object widget_callback_ex_hash_table;
183 }; 201 };
184 202
203 #ifdef NEW_GC
204 typedef struct gtk_frame Lisp_Gtk_Frame;
205
206 DECLARE_LISP_OBJECT (gtk_frame, Lisp_Gtk_Frame);
207
208 #define XGTK_FRAME(x) \
209 XRECORD (x, gtk_frame, Lisp_Gtk_Frame)
210 #define wrap_gtk_frame(p) wrap_record (p, gtk_frame)
211 #define GTK_FRAME_P(x) RECORDP (x, gtk_frame)
212 #endif /* NEW_GC */
213
185 #define FRAME_GTK_DATA(f) FRAME_TYPE_DATA (f, gtk) 214 #define FRAME_GTK_DATA(f) FRAME_TYPE_DATA (f, gtk)
186 215
187 #define FRAME_GTK_SHELL_WIDGET(f) (FRAME_GTK_DATA (f)->widget) 216 #define FRAME_GTK_SHELL_WIDGET(f) (FRAME_GTK_DATA (f)->widget)
188 #define FRAME_GTK_CONTAINER_WIDGET(f) (FRAME_GTK_DATA (f)->container) 217 #define FRAME_GTK_CONTAINER_WIDGET(f) (FRAME_GTK_DATA (f)->container)
189 #define FRAME_GTK_MENUBAR_WIDGET(f) (FRAME_GTK_DATA (f)->menubar_widget) 218 #define FRAME_GTK_MENUBAR_WIDGET(f) (FRAME_GTK_DATA (f)->menubar_widget)