From 945c857844b74866f90be20714aefc3149d2a991 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 17 Jul 2020 22:17:03 +0200
Subject: [PATCH] patch 8.2.1231: MS-Windows: GUI code can be cleaned up
Problem: MS-Windows: GUI code can be cleaned up.
Solution: Do a bit of cleaning up. (Ken Takata, closes #6465)
---
src/gui_w32.c | 18 ++++--------------
src/proto/gui_w32.pro | 1 -
src/version.c | 2 ++
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 30ce3eab03..46358dc131 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 68e45b3151..d850d22d16 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 7ee429473f..68c1e820c4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1231,
/**/
1230,
/**/
--
GitLab