From 5179924a95db47bec645f19c2f5a114c6b1d07cb Mon Sep 17 00:00:00 2001
From: Frank-74 <franktriggs@talktalk.net>
Date: Sat, 13 Aug 2016 16:17:17 +0100
Subject: [PATCH] Remove redundant WINPROC_OVERRIDE

---
 Source/Glide64/Main.cpp | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp
index 252d6bc05..e21bac4e5 100644
--- a/Source/Glide64/Main.cpp
+++ b/Source/Glide64/Main.cpp
@@ -79,12 +79,6 @@ int ev_fullscreen = 0;
 HINSTANCE hinstDLL = NULL;
 #endif
 
-#ifdef WINPROC_OVERRIDE
-LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-WNDPROC oldWndProc = NULL;
-WNDPROC myWndProc = NULL;
-#endif
-
 #ifdef ALTTAB_FIX
 HHOOK hhkLowLevelKybd = NULL;
 LRESULT CALLBACK LowLevelKeyboardProc(int nCode,
@@ -1284,11 +1278,6 @@ void CALL CloseDLL(void)
 {
     WriteTrace(TraceGlide64, TraceDebug, "-");
 
-    // re-set the old window proc
-#ifdef WINPROC_OVERRIDE
-    SetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC, (LONG_PTR)oldWndProc);
-#endif
-
 #ifdef ALTTAB_FIX
     if (hhkLowLevelKybd)
     {
@@ -1414,15 +1403,6 @@ int CALL InitiateGFX(GFX_INFO Gfx_Info)
 
     gfx = Gfx_Info;
 
-#ifdef WINPROC_OVERRIDE
-    // [H.Morii] inject our own winproc so that "alt-enter to fullscreen"
-    // message is shown when the emulator window is activated.
-    WNDPROC curWndProc = (WNDPROC)GetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC);
-    if (curWndProc && curWndProc != (WNDPROC)WndProc) {
-        oldWndProc = (WNDPROC)SetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC, (LONG_PTR)WndProc);
-    }
-#endif
-
     util_init();
     math_init();
     TexCacheInit();
@@ -2390,27 +2370,6 @@ void CALL SurfaceChanged(int width, int height)
 }
 #endif
 
-#ifdef WINPROC_OVERRIDE
-LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    switch (msg)
-    {
-    case WM_ACTIVATEAPP:
-        if (wParam == TRUE && !GfxInitDone) rdp.window_changed = TRUE;
-        break;
-    case WM_PAINT:
-        if (!GfxInitDone) rdp.window_changed = TRUE;
-        break;
-
-        /*    case WM_DESTROY:
-        SetWindowLong (gfx.hWnd, GWL_WNDPROC, (long)oldWndProc);
-        break;*/
-    }
-
-    return CallWindowProc(oldWndProc, hwnd, msg, wParam, lParam);
-}
-#endif
-
 int CheckKeyPressed(int key, int mask)
 {
     static Glide64Keys g64Keys;