To: vim-dev@vim.org Subject: Patch 6.1.230 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.230 (extra) Problem: Win16: building doesn't work. Solution: Exclude the XBUTTON handling. (Vince Negri) Files: src/gui_w48.c *** ../vim61.229/src/gui_w48.c Tue Oct 15 21:05:16 2002 --- src/gui_w48.c Wed Oct 16 20:26:29 2002 *************** *** 64,70 **** #define DLG_NONBUTTON_CONTROL 5000 /* First ID of non-button controls */ ! #ifndef WM_XBUTTONDOWN // For Win2K / winME ONLY # define WM_XBUTTONDOWN 0x020B # define WM_XBUTTONUP 0x020C # define WM_XBUTTONDBLCLK 0x020D --- 64,70 ---- #define DLG_NONBUTTON_CONTROL 5000 /* First ID of non-button controls */ ! #ifndef WM_XBUTTONDOWN /* For Win2K / winME ONLY */ # define WM_XBUTTONDOWN 0x020B # define WM_XBUTTONUP 0x020C # define WM_XBUTTONDBLCLK 0x020D *************** *** 612,618 **** button = MOUSE_MIDDLE; else if (s_uMsg == WM_RBUTTONDOWN || s_uMsg == WM_RBUTTONDBLCLK) button = MOUSE_RIGHT; ! #ifndef WIN16 // else if (s_uMsg == WM_XBUTTONDOWN || s_uMsg == WM_XBUTTONDBLCLK) { #ifndef GET_XBUTTON_WPARAM --- 612,618 ---- button = MOUSE_MIDDLE; else if (s_uMsg == WM_RBUTTONDOWN || s_uMsg == WM_RBUTTONDBLCLK) button = MOUSE_RIGHT; ! #ifndef WIN16 /**/ else if (s_uMsg == WM_XBUTTONDOWN || s_uMsg == WM_XBUTTONDBLCLK) { #ifndef GET_XBUTTON_WPARAM *************** *** 911,919 **** --- 911,921 ---- HANDLE_MSG(hwnd, WM_RBUTTONDBLCLK,_OnMouseButtonDown); HANDLE_MSG(hwnd, WM_RBUTTONDOWN,_OnMouseButtonDown); HANDLE_MSG(hwnd, WM_RBUTTONUP, _OnMouseMoveOrRelease); + #ifndef WIN16 /**/ HANDLE_MSG(hwnd, WM_XBUTTONDBLCLK,_OnMouseButtonDown); HANDLE_MSG(hwnd, WM_XBUTTONDOWN,_OnMouseButtonDown); HANDLE_MSG(hwnd, WM_XBUTTONUP, _OnMouseMoveOrRelease); + #endif default: return DefWindowProc(hwnd, uMsg, wParam, lParam); *** ../vim61.229/src/version.c Tue Oct 15 21:14:59 2002 --- src/version.c Wed Oct 16 20:27:31 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 230, /**/ -- hundred-and-one symptoms of being an internet addict: 245. You use Real Audio to listen to a radio station from a distant city rather than turn on your stereo system. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.vim.org \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///