Fix bug #16252 with 'mailto:' documents passed to w32-shell-execute.

[gnu-emacs] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index f66ec0b80ec17148de92c2bd215958a8985bc89f..73c5149e2cdd1b385c6db9a02173fa0fe7ac0165 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -404,15 +404,13 @@ set_frame_size (EmacsFrame ew)
        might end up with a frame width that is not a multiple of the
        frame's character width which is bad for vertically split
        windows.  */
-    f->scroll_bar_actual_width
-      = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f);
 
     compute_fringe_widths (f, 0);
 
 #if 0 /* This can run Lisp code, and it is dangerous to give
         out the frame to Lisp code before it officially exists.
         This is handled in Fx_create_frame so not needed here.  */
-    change_frame_size (f, h, w, 1, 0, 0);
+    change_frame_size (f, w, h, 1, 0, 0, 0);
 #endif
     char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height);
     ew->core.width = pixel_width;
@@ -467,7 +465,7 @@ update_wm_hints (EmacsFrame ew)
   if (! wmshell) return;
 
 #if 0
-  check_frame_size (ew->emacs_frame.frame, &min_rows, &min_cols);
+  check_frame_size (ew->emacs_frame.frame, &min_cols, &min_rows, 0);
 #endif
 
   pixel_to_char_size (ew, ew->core.width, ew->core.height,
@@ -525,7 +523,7 @@ setup_frame_gcs (EmacsFrame ew)
   font = Ffont_xlfd_name (font, Qnil);
   if (STRINGP (font))
     {
-      XFontStruct *xfont = XLoadQueryFont (FRAME_X_DISPLAY_INFO (s)->display,
+      XFontStruct *xfont = XLoadQueryFont (FRAME_DISPLAY_INFO (s)->display,
                                           SSDATA (font));
       if (xfont)
        {
@@ -681,7 +679,7 @@ EmacsFrameResize (Widget widget)
       || ew->core.width != FRAME_PIXEL_WIDTH (f)
       || ew->core.height + x->menubar_height != FRAME_PIXEL_HEIGHT (f))
     {
-      change_frame_size (f, rows, columns, 0, 1, 0);
+      change_frame_size (f, columns, rows, 0, 1, 0, 0);
       update_wm_hints (ew);
       update_various_frame_slots (ew);
 
@@ -735,8 +733,8 @@ EmacsFrameSetValues (Widget cur_widget, Widget req_widget, Widget new_widget, Ar
       new->core.width = pixel_width;
       new->core.height = pixel_height;
 
-      change_frame_size (new->emacs_frame.frame, char_height, char_width,
-                         1, 0, 0);
+      change_frame_size (new->emacs_frame.frame, char_width, char_height,
+                        1, 0, 0, 0);
       needs_a_refresh = True;
     }
 
@@ -798,7 +796,7 @@ EmacsFrameSetCharSize (Widget widget, int columns, int rows)
   EmacsFrame ew = (EmacsFrame) widget;
   struct frame *f = ew->emacs_frame.frame;
 
-  x_set_window_size (f, 0, columns, rows);
+  x_set_window_size (f, 0, columns, rows, 0);
 }
 
 \f
@@ -806,7 +804,7 @@ void
 widget_store_internal_border (Widget widget)
 {
   EmacsFrame ew = (EmacsFrame) widget;
-  FRAME_PTR f = ew->emacs_frame.frame;
+  struct frame *f = ew->emacs_frame.frame;
 
   ew->emacs_frame.internal_border_width = f->internal_border_width;
 }