aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.1231: MS-Windows: GUI code can be cleaned up

Browse Source 
Problem:    MS-Windows: GUI code can be cleaned up.
Solution:   Do a bit of cleaning up. (Ken Takata, closes #6465)
This commit is contained in:
Bram Moolenaar
2020-07-17 22:17:03 +02:00
parent 68d130c618
commit 945c857844
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui_w32.c
View File

@@ -240,6 +240,7 @@ gui_mch_set_rendering_options(char_u *s)
# define CONST # define CONST
# define FAR # define FAR
# define NEAR # define NEAR
# define WINAPI
# undef _cdecl # undef _cdecl
# define _cdecl # define _cdecl
typedef int BOOL; typedef int BOOL;
@@ -320,9 +321,6 @@ static int s_findrep_is_find; // TRUE for find dialog, FALSE
// for find/replace dialog // for find/replace dialog
#endif #endif
#if !defined(FEAT_GUI)
static
#endif
HWND s_hwnd = NULL; HWND s_hwnd = NULL;
static HDC s_hdc = NULL; static HDC s_hdc = NULL;
static HBRUSH s_brush = NULL; static HBRUSH s_brush = NULL;
@@ -389,7 +387,7 @@ directx_binddc(void)
#endif #endif
// use of WindowProc depends on Global IME // 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 extern int current_font_height; // this is in os_mswin.c
@@ -1259,12 +1257,8 @@ _TextAreaWndProc(
} }
} }
#ifdef PROTO static LRESULT WINAPI
typedef int WINAPI; MyWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
#endif
LRESULT WINAPI
vim_WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
#ifdef GLOBAL_IME #ifdef GLOBAL_IME
return global_ime_DefWindowProc(hwnd, message, wParam, lParam); return global_ime_DefWindowProc(hwnd, message, wParam, lParam);
@@ -3824,10 +3818,6 @@ _OnScroll(
# include "xpm_w32.h" # include "xpm_w32.h"
#endif #endif
#ifdef PROTO
# define WINAPI
#endif
#ifdef __MINGW32__ #ifdef __MINGW32__
/* /*
* Add a lot of missing defines. * Add a lot of missing defines.

1
src/proto/gui_w32.pro
View File

@@ -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_set_blinking(long wait, long on, long off);
void gui_mch_stop_blink(int may_call_gui_update_cursor); void gui_mch_stop_blink(int may_call_gui_update_cursor);
void gui_mch_start_blink(void); 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_new_colors(void);
void gui_mch_def_colors(void); void gui_mch_def_colors(void);
int gui_mch_open(void); int gui_mch_open(void);

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1231,
/**/ /**/
1230, 1230,
/**/ /**/