* xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.

* gtkutil.c (xg_create_frame_widgets): Don't set internal_border_width.

3 files changed, 14 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c20207da60b..8e24f83b15b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
+        * gtkutil.c (xg_create_frame_widgets): Don't set internal_border_width.
+
 2008-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xdisp.c (syms_of_xdisp): Default underline-minimum-offset to 1.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 77f0815b95e..fb766c445a4 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -909,8 +909,10 @@ xg_create_frame_widgets (f)
   gtk_widget_modify_style (wfixed, style);
 
   /* GTK does not set any border, and they look bad with GTK.  */
+  /* That they look bad is no excuse for imposing this here.  --Stef
+     It should be done by providing the proper default in Fx_create_Frame.
   f->border_width = 0;
-  f->internal_border_width = 0;
+  f->internal_border_width = 0; */
 
   UNBLOCK_INPUT;
 
diff --git a/src/xfns.c b/src/xfns.c
index b02c9ce8d25..8d4b105ea8f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3313,7 +3313,12 @@ This function is an internal primitive--use `make-frame' instead.  */)
         parms = Fcons (Fcons (Qinternal_border_width, value),
                        parms);
     }
-  x_default_parameter (f, parms, Qinternal_border_width, make_number (1),
+  x_default_parameter (f, parms, Qinternal_border_width,
+#ifdef USE_GTK /* We used to impose 0 in xg_create_frame_widgets.  */
+                       make_number (0),
+#else
+                       make_number (1),
+#endif
                        "internalBorderWidth", "internalBorderWidth",
                        RES_TYPE_NUMBER);
   x_default_parameter (f, parms, Qvertical_scroll_bars, Qleft,