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

Merge branch ben-lisp-object into default branch
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 06:47:37 -0600
parents a9c41067dd88
children 308d34e9f07d
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
55 * Printer settings, aka devmode 55 * Printer settings, aka devmode
56 */ 56 */
57 57
58 struct Lisp_Devmode 58 struct Lisp_Devmode
59 { 59 {
60 struct LCRECORD_HEADER header; 60 NORMAL_LISP_OBJECT_HEADER header;
61 61
62 /* Pointer to the DEVMODE structure */ 62 /* Pointer to the DEVMODE structure */
63 DEVMODEW *devmode; 63 DEVMODEW *devmode;
64 64
65 /* Full printer name. It can be longer than devmode->dmDeviceName 65 /* Full printer name. It can be longer than devmode->dmDeviceName
80 */ 80 */
81 81
82 struct mswindows_device 82 struct mswindows_device
83 { 83 {
84 #ifdef NEW_GC 84 #ifdef NEW_GC
85 struct lrecord_header header; 85 NORMAL_LISP_OBJECT_HEADER header;
86 #endif /* NEW_GC */ 86 #endif /* NEW_GC */
87 Lisp_Object fontlist; /* List of (STRING . FIXED-P), device fonts */ 87 Lisp_Object fontlist; /* List of (STRING . FIXED-P), device fonts */
88 HDC hcdc; /* Compatible DC */ 88 HDC hcdc; /* Compatible DC */
89 DWORD update_tick; /* Used when device is modified through 89 DWORD update_tick; /* Used when device is modified through
90 Windows messages, see WM_DISPLAYCHANGE 90 Windows messages, see WM_DISPLAYCHANGE
92 }; 92 };
93 93
94 #ifdef NEW_GC 94 #ifdef NEW_GC
95 typedef struct mswindows_device Lisp_Mswindows_Device; 95 typedef struct mswindows_device Lisp_Mswindows_Device;
96 96
97 DECLARE_LRECORD (mswindows_device, Lisp_Mswindows_Device); 97 DECLARE_LISP_OBJECT (mswindows_device, Lisp_Mswindows_Device);
98 98
99 #define XMSWINDOWS_DEVICE(x) \ 99 #define XMSWINDOWS_DEVICE(x) \
100 XRECORD (x, mswindows_device, Lisp_Mswindows_Device) 100 XRECORD (x, mswindows_device, Lisp_Mswindows_Device)
101 #define wrap_mswindows_device(p) wrap_record (p, mswindows_device) 101 #define wrap_mswindows_device(p) wrap_record (p, mswindows_device)
102 #define MSWINDOWS_DEVICE_P(x) RECORDP (x, mswindows_device) 102 #define MSWINDOWS_DEVICE_P(x) RECORDP (x, mswindows_device)
108 #define DEVICE_MSWINDOWS_UPDATE_TICK(d) (DEVICE_MSWINDOWS_DATA (d)->update_tick) 108 #define DEVICE_MSWINDOWS_UPDATE_TICK(d) (DEVICE_MSWINDOWS_DATA (d)->update_tick)
109 109
110 struct msprinter_device 110 struct msprinter_device
111 { 111 {
112 #ifdef NEW_GC 112 #ifdef NEW_GC
113 struct lrecord_header header; 113 NORMAL_LISP_OBJECT_HEADER header;
114 #endif /* NEW_GC */ 114 #endif /* NEW_GC */
115 HDC hdc, hcdc; /* Printer and the comp. DCs */ 115 HDC hdc, hcdc; /* Printer and the comp. DCs */
116 HANDLE hprinter; 116 HANDLE hprinter;
117 Lisp_Object name; 117 Lisp_Object name;
118 Lisp_Object devmode; 118 Lisp_Object devmode;
120 }; 120 };
121 121
122 #ifdef NEW_GC 122 #ifdef NEW_GC
123 typedef struct msprinter_device Lisp_Msprinter_Device; 123 typedef struct msprinter_device Lisp_Msprinter_Device;
124 124
125 DECLARE_LRECORD (msprinter_device, Lisp_Msprinter_Device); 125 DECLARE_LISP_OBJECT (msprinter_device, Lisp_Msprinter_Device);
126 126
127 #define XMSPRINTER_DEVICE(x) \ 127 #define XMSPRINTER_DEVICE(x) \
128 XRECORD (x, msprinter_device, Lisp_Msprinter_Device) 128 XRECORD (x, msprinter_device, Lisp_Msprinter_Device)
129 #define wrap_msprinter_device(p) wrap_record (p, msprinter_device) 129 #define wrap_msprinter_device(p) wrap_record (p, msprinter_device)
130 #define MSPRINTER_DEVICE_P(x) RECORDP (x, msprinter_device) 130 #define MSPRINTER_DEVICE_P(x) RECORDP (x, msprinter_device)
166 */ 166 */
167 167
168 struct mswindows_frame 168 struct mswindows_frame
169 { 169 {
170 #ifdef NEW_GC 170 #ifdef NEW_GC
171 struct lrecord_header header; 171 NORMAL_LISP_OBJECT_HEADER header;
172 #endif /* NEW_GC */ 172 #endif /* NEW_GC */
173 173
174 /* win32 window handle */ 174 /* win32 window handle */
175 HWND hwnd; 175 HWND hwnd;
176 176
228 }; 228 };
229 229
230 #ifdef NEW_GC 230 #ifdef NEW_GC
231 typedef struct mswindows_frame Lisp_Mswindows_Frame; 231 typedef struct mswindows_frame Lisp_Mswindows_Frame;
232 232
233 DECLARE_LRECORD (mswindows_frame, Lisp_Mswindows_Frame); 233 DECLARE_LISP_OBJECT (mswindows_frame, Lisp_Mswindows_Frame);
234 234
235 #define XMSWINDOWS_FRAME(x) \ 235 #define XMSWINDOWS_FRAME(x) \
236 XRECORD (x, mswindows_frame, Lisp_Mswindows_Frame) 236 XRECORD (x, mswindows_frame, Lisp_Mswindows_Frame)
237 #define wrap_mswindows_frame(p) wrap_record (p, mswindows_frame) 237 #define wrap_mswindows_frame(p) wrap_record (p, mswindows_frame)
238 #define MSWINDOWS_FRAME_P(x) RECORDP (x, mswindows_frame) 238 #define MSWINDOWS_FRAME_P(x) RECORDP (x, mswindows_frame)
310 #define XM_MAPFRAME (WM_USER + 102) 310 #define XM_MAPFRAME (WM_USER + 102)
311 #define XM_UNMAPFRAME (WM_USER + 103) 311 #define XM_UNMAPFRAME (WM_USER + 103)
312 312
313 struct mswindows_dialog_id 313 struct mswindows_dialog_id
314 { 314 {
315 struct LCRECORD_HEADER header; 315 NORMAL_LISP_OBJECT_HEADER header;
316 316
317 Lisp_Object frame; 317 Lisp_Object frame;
318 Lisp_Object callbacks; 318 Lisp_Object callbacks;
319 HWND hwnd; 319 HWND hwnd;
320 }; 320 };