To: Vince Negri In-Reply-To: <11F664DB9E16D3119CB90060084B96A205D91D@ASLMAIL> Cc: VIM Development List Subject: patch 5.4.4 (was: Vim 5.4 weeny bug with Win32 Toolbar... Fcc: outbox From: Bram Moolenaar ------------ Vince Negri wrote: > Problem: > Building Win32 or Win16 GUI without USE_TOOLBAR #defined worked, > but if your _gvimrc still had 'T' in guioptions a blank area the size of the > toolbar was forever located at the top of the window. > > Cause: > Some bits of GUI assumed that MS Windows GUI necessarily has to have a > toolbar, when this is not the case. > > Fix: > See below. Thanks. Here is the "official" patch version for the same: Patch 5.4.4 Problem: Win32: When compiled without toolbar, but the 'T' flag is in 'guioptions', there would be an empty space for the toolbar. Solution: Add two #ifdefs where checking for the 'T' flag. (Vince Negri) Files: src/gui.c *** ../vim-5.4/src/gui.c Sun Jul 25 22:02:00 1999 --- src/gui.c Thu Jul 29 10:40:21 1999 *************** *** 856,862 **** if (gui.which_scrollbars[SBAR_LEFT]) text_area_x += gui.scrollbar_width; ! #ifdef USE_GUI_MSWIN if (vim_strchr(p_go, GO_TOOLBAR) != NULL) text_area_y = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; else --- 864,870 ---- if (gui.which_scrollbars[SBAR_LEFT]) text_area_x += gui.scrollbar_width; ! #if defined(USE_GUI_MSWIN) && defined(USE_TOOLBAR) if (vim_strchr(p_go, GO_TOOLBAR) != NULL) text_area_y = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; else *************** *** 2537,2543 **** y += gui.menu_height; #endif ! #ifdef USE_GUI_MSWIN if (vim_strchr(p_go, GO_TOOLBAR) != NULL) y += TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; #endif --- 2545,2551 ---- y += gui.menu_height; #endif ! #if defined(USE_GUI_MSWIN) && defined(USE_TOOLBAR) if (vim_strchr(p_go, GO_TOOLBAR) != NULL) y += TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; #endif *** ../vim-5.4/version.h Thu Jul 29 10:47:45 1999 --- src/version.h Thu Jul 29 10:48:06 1999 *************** *** 19,26 **** #define VIM_VERSION_MINOR_STR "4" #define VIM_VERSION_BUILD 57 #define VIM_VERSION_BUILD_STR "57" ! #define VIM_VERSION_PATCHLEVEL 3 ! #define VIM_VERSION_PATCHLEVEL_STR "3" /* * VIM_VERSION_NODOT is used for the runtime directory name. --- 19,26 ---- #define VIM_VERSION_MINOR_STR "4" #define VIM_VERSION_BUILD 57 #define VIM_VERSION_BUILD_STR "57" ! #define VIM_VERSION_PATCHLEVEL 4 ! #define VIM_VERSION_PATCHLEVEL_STR "4" /* * VIM_VERSION_NODOT is used for the runtime directory name. *************** *** 30,35 **** */ #define VIM_VERSION_NODOT "vim54" #define VIM_VERSION_SHORT "5.4" ! #define VIM_VERSION_MEDIUM "5.4.3" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.3 (1999 Jul 28)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.3 (1999 Jul 28, compiled " --- 30,35 ---- */ #define VIM_VERSION_NODOT "vim54" #define VIM_VERSION_SHORT "5.4" ! #define VIM_VERSION_MEDIUM "5.4.4" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.4 (1999 Jul 29)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.4 (1999 Jul 29, compiled " -- ARTHUR: Will you ask your master if he wants to join my court at Camelot?! GUARD #1: But then of course African swallows are not migratory. GUARD #2: Oh, yeah... GUARD #1: So they couldn't bring a coconut back anyway... The Quest for the Holy Grail (Monty Python) --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /