compatibility changes: WXWIN_COMPATIBILITY_EVENT_TYPES and DECLARE_EVENT_TABLE_ENTRY...

[wxWidgets.git] / include / wx / app.h

diff --git a/include/wx/app.h b/include/wx/app.h
index cb327df858f62151cb28d2c11b1b3bdad462692e..5538e053bddc695ff0e2c4959e1c938d4668442b 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -380,35 +380,18 @@ public:
         #define WXAPIENTRY WXFAR wxSTDCALL
     #endif
 
-    // Patch from Mumit Khan to allow DLL compilation under mingw. Note that
-    // this includes <windows.h> which is a bad thing because it prevents
-    // wxWindows to work with MFC, so for now I'm making this change for
-    // mingw/cygwin only (these don't work with MFC yet). GRG Mar/2000
-    #ifdef(__GNUWIN32__)
-        #include <windows.h>
-        #include "wx/msw/winundef.h"
-
-        #define IMPLEMENT_WXWIN_MAIN \
-            extern "C" int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int);\
-            int WINAPI WinMain(HINSTANCE hInstance, \
-                               HINSTANCE hPrevInstance,\
-                               LPSTR m_lpCmdLine, int nCmdShow )\
-            {\
-                return wxEntry((WXHINSTANCE) hInstance, \
-                               (WXHINSTANCE) hPrevInstance,\
-                               m_lpCmdLine, nCmdShow);\
-            }
-    #else
-        #define IMPLEMENT_WXWIN_MAIN \
-            int WXAPIENTRY WinMain(HINSTANCE hInstance, \
-                                   HINSTANCE hPrevInstance,\
-                                   LPSTR m_lpCmdLine, int nCmdShow )\
-            {\
-                return wxEntry((WXHINSTANCE) hInstance, \
-                               (WXHINSTANCE) hPrevInstance,\
-                               m_lpCmdLine, nCmdShow);\
-            }
-    #endif
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
+
+    #define IMPLEMENT_WXWIN_MAIN \
+        extern "C" int WXAPIENTRY WinMain(HINSTANCE hInstance,\
+                                          HINSTANCE hPrevInstance,\
+                                          LPSTR m_lpCmdLine, int nCmdShow)\
+        {\
+            return wxEntry((WXHINSTANCE) hInstance,\
+                           (WXHINSTANCE) hPrevInstance,\
+                           m_lpCmdLine, nCmdShow);\
+        }
 #else
     #define IMPLEMENT_WXWIN_MAIN
 #endif