merge from upstream. currently seems to have bitroted and i get segfaults

[gnu-emacs] / src / gtkutil.c

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6367949a649c921fd0862228b779ca7e90cca20b..c0bc5fc82bf35d120486029baf57c06c09225dc8 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -956,6 +956,10 @@ style_changed_cb (GObject *go,
 /* Create and set up the GTK widgets for frame F.
    Return 0 if creation failed, non-zero otherwise.  */
 
+
+
+
+
 int
 xg_create_frame_widgets (FRAME_PTR f)
 {
@@ -977,7 +981,7 @@ xg_create_frame_widgets (FRAME_PTR f)
 
   wvbox = gtk_vbox_new (FALSE, 0);
   whbox = gtk_hbox_new (FALSE, 0);
-  wfixed = gtk_fixed_new ();  /* Must have this to place scroll bars  */
+  f->gwfixed =  wfixed = gtk_fixed_new ();  /* Must have this to place scroll bars  */
 
   if (! wtop || ! wvbox || ! whbox || ! wfixed)
     {