[Emacs-diffs] Changes to emacs/src/gtkutil.c

[Kim F . Storm]

Index: emacs/src/gtkutil.c
diff -c emacs/src/gtkutil.c:1.61 emacs/src/gtkutil.c:1.62
*** emacs/src/gtkutil.c:1.61    Thu Feb  3 19:50:08 2005
--- emacs/src/gtkutil.c Mon Feb 21 08:51:52 2005
***************
*** 584,597 ****
  {
    int mbheight = FRAME_MENUBAR_HEIGHT (f);
    int tbheight = FRAME_TOOLBAR_HEIGHT (f);
!   int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight 
                                                   - mbheight - tbheight));
    int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
  
    if (FRAME_GTK_WIDGET (f)
!       && (columns != FRAME_COLS (f) 
          || rows != FRAME_LINES (f)
!           || pixelwidth != FRAME_PIXEL_WIDTH (f) 
          || pixelheight != FRAME_PIXEL_HEIGHT (f)))
      {
        struct x_output *x = f->output_data.x;
--- 584,597 ----
  {
    int mbheight = FRAME_MENUBAR_HEIGHT (f);
    int tbheight = FRAME_TOOLBAR_HEIGHT (f);
!   int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight
                                                   - mbheight - tbheight));
    int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
  
    if (FRAME_GTK_WIDGET (f)
!       && (columns != FRAME_COLS (f)
          || rows != FRAME_LINES (f)
!           || pixelwidth != FRAME_PIXEL_WIDTH (f)
          || pixelheight != FRAME_PIXEL_HEIGHT (f)))
      {
        struct x_output *x = f->output_data.x;
***************
*** 719,724 ****
--- 719,725 ----
        if (wvbox) gtk_widget_destroy (wvbox);
        if (wfixed) gtk_widget_destroy (wfixed);
  
+       UNBLOCK_INPUT;
        return 0;
      }
  
***************
*** 2881,2887 ****
        if (xg_timer) xg_stop_timer ();
        bar->dragging = Qnil;
      }
!   
    return FALSE;
  }
  
--- 2882,2888 ----
        if (xg_timer) xg_stop_timer ();
        bar->dragging = Qnil;
      }
! 
    return FALSE;
  }
  
***************
*** 2945,2951 ****
       event box window.  */
    gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), webox, -1, -1);
    gtk_container_add (GTK_CONTAINER (webox), wscroll);
!   
  
    /* Set the cursor to an arrow.  */
    xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
--- 2946,2952 ----
       event box window.  */
    gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), webox, -1, -1);
    gtk_container_add (GTK_CONTAINER (webox), wscroll);
! 
  
    /* Set the cursor to an arrow.  */
    xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
***************
*** 3270,3279 ****
  
    event->area.x = max (0, event->area.x);
    event->area.y = max (0, event->area.y);
!   
    event->area.width = max (width, event->area.width);
    event->area.height = max (height, event->area.height);
!   
    return FALSE;
  }
  
--- 3271,3280 ----
  
    event->area.x = max (0, event->area.x);
    event->area.y = max (0, event->area.y);
! 
    event->area.width = max (width, event->area.width);
    event->area.height = max (height, event->area.height);
! 
    return FALSE;
  }
  
***************
*** 3394,3400 ****
       DEFAULT_TOOL_BAR_BUTTON_MARGIN has no effect.  */
    hmargin = max (0, hmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
    vmargin = max (0, vmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
!   
    if (! x->toolbar_widget)
      xg_create_tool_bar (f);
  
--- 3395,3401 ----
       DEFAULT_TOOL_BAR_BUTTON_MARGIN has no effect.  */
    hmargin = max (0, hmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
    vmargin = max (0, vmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
! 
    if (! x->toolbar_widget)
      xg_create_tool_bar (f);