Mercurial > hg > xemacs-beta

comparison src/console-gtk-impl.h @ 5133:444a448b2f53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch ben-lisp-object into default branch
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 06:47:37 -0600
parents 7be849cb8828
children 308d34e9f07d
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
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 52 #ifdef NEW_GC
53 struct lrecord_header header; 53 NORMAL_LISP_OBJECT_HEADER header;
54 #endif /* NEW_GC */ 54 #endif /* NEW_GC */
55 /* Gtk application info. */ 55 /* Gtk application info. */
56 GtkWidget *gtk_app_shell; 56 GtkWidget *gtk_app_shell;
57 57
58 /* Cache of GC's for frame's on this device. */ 58 /* Cache of GC's for frame's on this device. */
113 }; 113 };
114 114
115 #ifdef NEW_GC 115 #ifdef NEW_GC
116 typedef struct gtk_device Lisp_Gtk_Device; 116 typedef struct gtk_device Lisp_Gtk_Device;
117 117
118 DECLARE_LRECORD (gtk_device, Lisp_Gtk_Device); 118 DECLARE_LISP_OBJECT (gtk_device, Lisp_Gtk_Device);
119 119
120 #define XGTK_DEVICE(x) \ 120 #define XGTK_DEVICE(x) \
121 XRECORD (x, gtk_device, Lisp_Gtk_Device) 121 XRECORD (x, gtk_device, Lisp_Gtk_Device)
122 #define wrap_gtk_device(p) wrap_record (p, gtk_device) 122 #define wrap_gtk_device(p) wrap_record (p, gtk_device)
123 #define GTK_DEVICE_P(x) RECORDP (x, gtk_device) 123 #define GTK_DEVICE_P(x) RECORDP (x, gtk_device)
142 #define MAX_CONCURRENT_TOP_WIDGETS 8 142 #define MAX_CONCURRENT_TOP_WIDGETS 8
143 143
144 struct gtk_frame 144 struct gtk_frame
145 { 145 {
146 #ifdef NEW_GC 146 #ifdef NEW_GC
147 struct lrecord_header header; 147 NORMAL_LISP_OBJECT_HEADER header;
148 #endif /* NEW_GC */ 148 #endif /* NEW_GC */
149 149
150 /* The widget of this frame. */ 150 /* The widget of this frame. */
151 GtkWidget *widget; /* This is really a GtkWindow */ 151 GtkWidget *widget; /* This is really a GtkWindow */
152 152
206 }; 206 };
207 207
208 #ifdef NEW_GC 208 #ifdef NEW_GC
209 typedef struct gtk_frame Lisp_Gtk_Frame; 209 typedef struct gtk_frame Lisp_Gtk_Frame;
210 210
211 DECLARE_LRECORD (gtk_frame, Lisp_Gtk_Frame); 211 DECLARE_LISP_OBJECT (gtk_frame, Lisp_Gtk_Frame);
212 212
213 #define XGTK_FRAME(x) \ 213 #define XGTK_FRAME(x) \
214 XRECORD (x, gtk_frame, Lisp_Gtk_Frame) 214 XRECORD (x, gtk_frame, Lisp_Gtk_Frame)
215 #define wrap_gtk_frame(p) wrap_record (p, gtk_frame) 215 #define wrap_gtk_frame(p) wrap_record (p, gtk_frame)
216 #define GTK_FRAME_P(x) RECORDP (x, gtk_frame) 216 #define GTK_FRAME_P(x) RECORDP (x, gtk_frame)