Mercurial > hg > xemacs-beta

comparison src/frame-msw.c @ 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 a9c41067dd88
children 71ee43b8a74d
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
91 { XD_LISP_OBJECT, offsetof (struct mswindows_frame, widget_hash_table3) }, 91 { XD_LISP_OBJECT, offsetof (struct mswindows_frame, widget_hash_table3) },
92 { XD_END } 92 { XD_END }
93 }; 93 };
94 94
95 #ifdef NEW_GC 95 #ifdef NEW_GC
96 DEFINE_LRECORD_IMPLEMENTATION ("mswindows-frame", mswindows_frame, 96 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("mswindows-frame", mswindows_frame,
97 1, /*dumpable-flag*/ 97 0, mswindows_frame_data_description_1,
98 0, 0, 0, 0, 0, 98 Lisp_Mswindows_Frame);
99 mswindows_frame_data_description_1,
100 Lisp_Mswindows_Frame);
101 #else /* not NEW_GC */ 99 #else /* not NEW_GC */
102 extern const struct sized_memory_description mswindows_frame_data_description; 100 extern const struct sized_memory_description mswindows_frame_data_description;
103 101
104 const struct sized_memory_description mswindows_frame_data_description = { 102 const struct sized_memory_description mswindows_frame_data_description = {
105 sizeof (struct mswindows_frame), mswindows_frame_data_description_1 103 sizeof (struct mswindows_frame), mswindows_frame_data_description_1
172 height = Fplist_get (props, Qheight, Qnil); 170 height = Fplist_get (props, Qheight, Qnil);
173 if (!NILP (height)) 171 if (!NILP (height))
174 CHECK_INT (height); 172 CHECK_INT (height);
175 173
176 #ifdef NEW_GC 174 #ifdef NEW_GC
177 f->frame_data = alloc_lrecord_type (struct mswindows_frame, 175 f->frame_data = XMSWINDOWS_FRAME (ALLOC_NORMAL_LISP_OBJECT (mswindows_frame));
178 &lrecord_mswindows_frame);
179 #else /* not NEW_GC */ 176 #else /* not NEW_GC */
180 f->frame_data = xnew_and_zero (struct mswindows_frame); 177 f->frame_data = xnew_and_zero (struct mswindows_frame);
181 #endif /* not NEW_GC */ 178 #endif /* not NEW_GC */
182 FRAME_MSWINDOWS_TARGET_RECT (f) = xnew_and_zero (XEMACS_RECT_WH); 179 FRAME_MSWINDOWS_TARGET_RECT (f) = xnew_and_zero (XEMACS_RECT_WH);
183 180
1210 1207
1211 void 1208 void
1212 syms_of_frame_mswindows (void) 1209 syms_of_frame_mswindows (void)
1213 { 1210 {
1214 #ifdef NEW_GC 1211 #ifdef NEW_GC
1215 INIT_LRECORD_IMPLEMENTATION (mswindows_frame); 1212 INIT_LISP_OBJECT (mswindows_frame);
1216 #endif /* NEW_GC */ 1213 #endif /* NEW_GC */
1217 } 1214 }
1218 1215
1219 void 1216 void
1220 reinit_vars_of_frame_mswindows (void) 1217 reinit_vars_of_frame_mswindows (void)