Mercurial > hg > xemacs-beta

comparison src/frame-gtk.c @ 5178:97eb4942aec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents 8b2f75cecb89 7be849cb8828
children 71ee43b8a74d
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
101 { XD_LISP_OBJECT, offsetof (struct gtk_frame, menubar_data) }, 101 { XD_LISP_OBJECT, offsetof (struct gtk_frame, menubar_data) },
102 { XD_END } 102 { XD_END }
103 }; 103 };
104 104
105 #ifdef NEW_GC 105 #ifdef NEW_GC
106 DEFINE_LRECORD_IMPLEMENTATION ("gtk-frame", gtk_frame, 106 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("gtk-frame", gtk_frame,
107 1, /*dumpable-flag*/ 107 0, gtk_frame_data_description_1,
108 0, 0, 0, 0, 0, 108 Lisp_Gtk_Frame);
109 gtk_frame_data_description_1,
110 Lisp_Gtk_Frame);
111 #else /* not NEW_GC */ 109 #else /* not NEW_GC */
112 extern const struct sized_memory_description gtk_frame_data_description; 110 extern const struct sized_memory_description gtk_frame_data_description;
113 111
114 const struct sized_memory_description gtk_frame_data_description = { 112 const struct sized_memory_description gtk_frame_data_description = {
115 sizeof (struct gtk_frame), gtk_frame_data_description_1 113 sizeof (struct gtk_frame), gtk_frame_data_description_1
633 /* set the position of the frame's root window now. When the 631 /* set the position of the frame's root window now. When the
634 frame was created, the position was initialized to (0,0). */ 632 frame was created, the position was initialized to (0,0). */
635 { 633 {
636 struct window *win = XWINDOW (f->root_window); 634 struct window *win = XWINDOW (f->root_window);
637 635
638 WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f); 636 WINDOW_LEFT (win) = FRAME_PANED_LEFT_EDGE (f);
639 WINDOW_TOP (win) = FRAME_TOP_BORDER_END (f); 637 WINDOW_TOP (win) = FRAME_PANED_TOP_EDGE (f);
640 638
641 if (!NILP (f->minibuffer_window)) 639 if (!NILP (f->minibuffer_window))
642 { 640 {
643 win = XWINDOW (f->minibuffer_window); 641 win = XWINDOW (f->minibuffer_window);
644 WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f); 642 WINDOW_LEFT (win) = FRAME_PANED_LEFT_EDGE (f);
645 } 643 }
646 } 644 }
647 645
648 gtk_set_initial_frame_size (f, x, y, w, h); 646 gtk_set_initial_frame_size (f, x, y, w, h);
649 } 647 }
972 { 970 {
973 int i; 971 int i;
974 972
975 /* zero out all slots. */ 973 /* zero out all slots. */
976 #ifdef NEW_GC 974 #ifdef NEW_GC
977 f->frame_data = alloc_lrecord_type (struct gtk_frame, &lrecord_gtk_frame); 975 f->frame_data = XGTK_FRAME (ALLOC_NORMAL_LISP_OBJECT (gtk_frame));
978 #else /* not NEW_GC */ 976 #else /* not NEW_GC */
979 f->frame_data = xnew_and_zero (struct gtk_frame); 977 f->frame_data = xnew_and_zero (struct gtk_frame);
980 #endif /* not NEW_GC */ 978 #endif /* not NEW_GC */
981 979
982 /* yeah, except the lisp ones */ 980 /* yeah, except the lisp ones */
1473 1471
1474 void 1472 void
1475 syms_of_frame_gtk (void) 1473 syms_of_frame_gtk (void)
1476 { 1474 {
1477 #ifdef NEW_GC 1475 #ifdef NEW_GC
1478 INIT_LRECORD_IMPLEMENTATION (gtk_frame); 1476 INIT_LISP_OBJECT (gtk_frame);
1479 #endif /* NEW_GC */ 1477 #endif /* NEW_GC */
1480 1478
1481 DEFSYMBOL (Qtext_widget); 1479 DEFSYMBOL (Qtext_widget);
1482 DEFSYMBOL (Qcontainer_widget); 1480 DEFSYMBOL (Qcontainer_widget);
1483 DEFSYMBOL (Qshell_widget); 1481 DEFSYMBOL (Qshell_widget);