diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-05-10 18:19:11 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-05-10 18:19:11 +0000 |
| commit | 2c7a763832663d5878ff37a58c81fbe95527084a (patch) | |
| tree | de001b1fcec1cf19bd23211eaa6dde7a0701c13b /src/gui_w32.c | |
| parent | 720c710091ba23dcbfca46766d87b4bb57dbc892 (diff) | |
updated for version 7.1b
Diffstat (limited to 'src/gui_w32.c')
| -rw-r--r-- | src/gui_w32.c | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 11330a9719..c8f409c46f 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -1,4 +1,4 @@ -/* vi:set ts=8 sts=4 sw=4: +s, if any./* vi:set ts=8 sts=4 sw=4: * * VIM - Vi IMproved by Bram Moolenaar * GUI support by Robert Webb @@ -232,7 +232,29 @@ typedef struct tagNMTTDISPINFO_NEW LPARAM lParam; } NMTTDISPINFO_NEW; -#ifndef LPNMTTDISPINFO +#include <poppack.h> + +typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *); +#ifndef TTM_SETMAXTIPWIDTH +# define TTM_SETMAXTIPWIDTH (WM_USER+24) +#endif + +#ifndef TTF_DI_SETITEM +# define TTF_DI_SETITEM 0x8000 +#endif + +#ifndef TTN_GETDISPINFO +# define TTN_GETDISPINFO (TTN_FIRST - 0) +#endif + +#endif /* defined(FEAT_BEVAL) */ + +#if defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE) +/* Older MSVC compilers don't have LPNMTTDISPINFO[AW] thus we need to define + * it here if LPNMTTDISPINFO isn't defined. + * MingW doesn't define LPNMTTDISPINFO but typedefs it. Thus we need to check + * _MSC_VER. */ +# if !defined(LPNMTTDISPINFO) && defined(_MSC_VER) typedef struct tagNMTTDISPINFOA { NMHDR hdr; LPSTR lpszText; @@ -241,8 +263,9 @@ typedef struct tagNMTTDISPINFOA { UINT uFlags; LPARAM lParam; } NMTTDISPINFOA, *LPNMTTDISPINFOA; -# define LPNMTTDISPINFO LPNMTTDISPINFOA +# define LPNMTTDISPINFO LPNMTTDISPINFOA +# ifdef FEAT_MBYTE typedef struct tagNMTTDISPINFOW { NMHDR hdr; LPWSTR lpszText; @@ -251,25 +274,10 @@ typedef struct tagNMTTDISPINFOW { UINT uFlags; LPARAM lParam; } NMTTDISPINFOW, *LPNMTTDISPINFOW; +# endif +# endif #endif -#include <poppack.h> - -typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *); -#ifndef TTM_SETMAXTIPWIDTH -# define TTM_SETMAXTIPWIDTH (WM_USER+24) -#endif - -#ifndef TTF_DI_SETITEM -# define TTF_DI_SETITEM 0x8000 -#endif - -#ifndef TTN_GETDISPINFO -# define TTN_GETDISPINFO (TTN_FIRST - 0) -#endif - -#endif /* defined(FEAT_BEVAL) */ - #ifndef TTN_GETDISPINFOW # define TTN_GETDISPINFOW (TTN_FIRST - 10) #endif @@ -3326,7 +3334,7 @@ gui_mch_dialog( * he/she can use arrow keys. * * new NOTE: BS_DEFPUSHBUTTON is required to be able to select the - * right buttun when hitting <Enter>. E.g., for the ":confirm quit" + * right button when hitting <Enter>. E.g., for the ":confirm quit" * dialog. Also needed for when the textfield is the default control. * It appears to work now (perhaps not on Win95?). */ @@ -4048,7 +4056,7 @@ initialise_toolbar(void) s_hwnd, WS_CHILD | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT, 4000, //any old big number - 31, //number of images in inital bitmap + 31, //number of images in initial bitmap s_hinst, IDR_TOOLBAR1, // id of initial bitmap NULL, |