Mercurial > hg > xemacs-beta
diff src/frame-gtk.c @ 771:943eaba38521
[xemacs-hg @ 2002-03-13 08:51:24 by ben]
The big ben-mule-21-5 check-in!
Various files were added and deleted. See CHANGES-ben-mule.
There are still some test suite failures. No crashes, though.
Many of the failures have to do with problems in the test suite itself
rather than in the actual code. I'll be addressing these in the next
day or so -- none of the test suite failures are at all critical.
Meanwhile I'll be trying to address the biggest issues -- i.e. build
or run failures, which will almost certainly happen on various platforms.
All comments should be sent to ben@xemacs.org -- use a Cc: if necessary
when sending to mailing lists. There will be pre- and post- tags,
something like
pre-ben-mule-21-5-merge-in, and
post-ben-mule-21-5-merge-in.
| author | ben |
|---|---|
| date | Wed, 13 Mar 2002 08:54:06 +0000 |
| parents | fdefd0186b75 |
| children | e38acbeb1cae |
line wrap: on
line diff
--- a/src/frame-gtk.c Fri Mar 08 13:33:14 2002 +0000 +++ b/src/frame-gtk.c Wed Mar 13 08:54:06 2002 +0000 @@ -226,7 +226,7 @@ } #ifdef STUPID_X_SPECIFIC_GTK_STUFF if (EQ (Qwindow_id, property)) - return Fgtk_window_id (make_frame (f)); + return Fgtk_window_id (wrap_frame (f)); #endif return Qunbound; @@ -256,7 +256,7 @@ props = cons3 (Qtext_widget, FRAME_GTK_LISP_WIDGETS (f)[2], props); #ifdef STUPID_X_SPECIFIC_GTK_STUFF - props = cons3 (Qwindow_id, Fgtk_window_id (make_frame (f)), props); + props = cons3 (Qwindow_id, Fgtk_window_id (wrap_frame (f)), props); #endif if (!GET_GTK_WIDGET_WINDOW (shell)) @@ -334,7 +334,7 @@ if (GTK_IS_WINDOW (shell)) { /* Deal with the cell size */ - default_face_height_and_width (make_frame (f), &geometry.height_inc, &geometry.width_inc); + default_face_height_and_width (wrap_frame (f), &geometry.height_inc, &geometry.width_inc); geometry_mask |= GDK_HINT_RESIZE_INC; gtk_window_set_geometry_hints (GTK_WINDOW (shell), @@ -943,7 +943,8 @@ /************************************************************************/ static void -gtk_init_frame_1 (struct frame *f, Lisp_Object props) +gtk_init_frame_1 (struct frame *f, Lisp_Object props, + int frame_name_is_defaulted) { /* This function can GC */ Lisp_Object initially_unmapped; @@ -1121,7 +1122,7 @@ if (GTK_IS_WINDOW (shell)) { /* Update the cell size */ - default_face_height_and_width (make_frame (f), &geometry.height_inc, &geometry.width_inc); + default_face_height_and_width (wrap_frame (f), &geometry.height_inc, &geometry.width_inc); geometry_mask |= GDK_HINT_RESIZE_INC; gtk_window_set_geometry_hints (GTK_WINDOW (shell), @@ -1299,7 +1300,7 @@ gint width_inc = 10; gint height_inc = 10; - default_face_height_and_width (make_frame (frm), &height_inc, &width_inc); + default_face_height_and_width (wrap_frame (frm), &height_inc, &width_inc); geometry_mask = GDK_HINT_RESIZE_INC; geometry.width_inc = width_inc; geometry.height_inc = height_inc;