diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-17 22:17:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-17 22:17:03 +0200 |
| commit | 945c857844b74866f90be20714aefc3149d2a991 (patch) | |
| tree | 7b0d8d1bf36e27fe5cdfdfb0b1082a66f8f93e42 | |
| parent | 68d130c618f363821761f231c4122a0b9b764b71 (diff) | |
| download | vim-git-945c857844b74866f90be20714aefc3149d2a991.tar.gz | |
patch 8.2.1231: MS-Windows: GUI code can be cleaned upv8.2.1231
Problem: MS-Windows: GUI code can be cleaned up.
Solution: Do a bit of cleaning up. (Ken Takata, closes #6465)
| -rw-r--r-- | src/gui_w32.c | 18 | ||||
| -rw-r--r-- | src/proto/gui_w32.pro | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 30ce3eab0..46358dc13 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -240,6 +240,7 @@ gui_mch_set_rendering_options(char_u *s) # define CONST # define FAR # define NEAR +# define WINAPI # undef _cdecl # define _cdecl typedef int BOOL; @@ -320,9 +321,6 @@ static int s_findrep_is_find; // TRUE for find dialog, FALSE // for find/replace dialog #endif -#if !defined(FEAT_GUI) -static -#endif HWND s_hwnd = NULL; static HDC s_hdc = NULL; static HBRUSH s_brush = NULL; @@ -389,7 +387,7 @@ directx_binddc(void) #endif // use of WindowProc depends on Global IME -#define MyWindowProc vim_WindowProc +static LRESULT WINAPI MyWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); extern int current_font_height; // this is in os_mswin.c @@ -1259,12 +1257,8 @@ _TextAreaWndProc( } } -#ifdef PROTO -typedef int WINAPI; -#endif - - LRESULT WINAPI -vim_WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) + static LRESULT WINAPI +MyWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { #ifdef GLOBAL_IME return global_ime_DefWindowProc(hwnd, message, wParam, lParam); @@ -3824,10 +3818,6 @@ _OnScroll( # include "xpm_w32.h" #endif -#ifdef PROTO -# define WINAPI -#endif - #ifdef __MINGW32__ /* * Add a lot of missing defines. diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro index 68e45b315..d850d22d1 100644 --- a/src/proto/gui_w32.pro +++ b/src/proto/gui_w32.pro @@ -5,7 +5,6 @@ int gui_mch_is_blink_off(void); void gui_mch_set_blinking(long wait, long on, long off); void gui_mch_stop_blink(int may_call_gui_update_cursor); void gui_mch_start_blink(void); -LRESULT WINAPI vim_WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); void gui_mch_new_colors(void); void gui_mch_def_colors(void); int gui_mch_open(void); diff --git a/src/version.c b/src/version.c index 7ee429473..68c1e820c 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1231, +/**/ 1230, /**/ 1229, |