changeset 95954:184aae567806

* 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.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 15 Jun 2008 05:53:48 +0000
parents bdf59d1e1bee
children cbe26a0456e0
files src/ChangeLog src/gtkutil.c src/xfns.c
diffstat 3 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Jun 15 04:43:35 2008 +0000
+++ b/src/ChangeLog	Sun Jun 15 05:53:48 2008 +0000
@@ -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.
--- a/src/gtkutil.c	Sun Jun 15 04:43:35 2008 +0000
+++ b/src/gtkutil.c	Sun Jun 15 05:53:48 2008 +0000
@@ -909,8 +909,10 @@
   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;
 
--- a/src/xfns.c	Sun Jun 15 04:43:35 2008 +0000
+++ b/src/xfns.c	Sun Jun 15 05:53:48 2008 +0000
@@ -3313,7 +3313,12 @@
 	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,