To: vim-dev@vim.org
Subject: Patch 6.0.122
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.0.122 (extra)
Problem:    Win16: Same resize problems as patch 6.0.117 fixed for Win32.  And
	    dialog textfield problem from patch 6.0.115.
Solution:   Set old_menu_height only when used.  Add ES_AUTOHSCROLL flag.
	    (Vince Negri)
Files:	    src/gui_w16.c


*** ../vim60.121/src/gui_w16.c	Wed Sep 19 14:44:12 2001
--- src/gui_w16.c	Wed Jan  9 16:17:08 2002
***************
*** 123,131 ****
      }
  
      if (fix_window && menu_height != old_menu_height)
  	gui_set_shellsize(FALSE, FALSE);
  
-     old_menu_height = menu_height;
      return menu_height;
  }
  #endif /*FEAT_MENU*/
--- 123,133 ----
      }
  
      if (fix_window && menu_height != old_menu_height)
+     {
+ 	old_menu_height = menu_height;
  	gui_set_shellsize(FALSE, FALSE);
+     }
  
      return menu_height;
  }
  #endif /*FEAT_MENU*/
***************
*** 1481,1487 ****
      /* Edit box */
      if (textfield != NULL)
      {
! 	p = add_dialog_element(p, ES_LEFT | WS_TABSTOP | WS_BORDER,
  		PixelToDialogX(2 * dlgPaddingX),
  		PixelToDialogY(2 * dlgPaddingY + msgheight),
  		PixelToDialogX(dlgwidth - 4 * dlgPaddingX),
--- 1483,1489 ----
      /* Edit box */
      if (textfield != NULL)
      {
! 	p = add_dialog_element(p, ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP | WS_BORDER,
  		PixelToDialogX(2 * dlgPaddingX),
  		PixelToDialogY(2 * dlgPaddingY + msgheight),
  		PixelToDialogX(dlgwidth - 4 * dlgPaddingX),
*** ../vim60.121/src/version.c	Wed Jan  9 16:08:19 2002
--- src/version.c	Wed Jan  9 16:18:48 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     122,
  /**/

-- 
It is illegal to take more than three sips of beer at a time while standing.
		[real standing law in Texas, United States of America]

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
(((   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   )))
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///