wxControl and wxChoice derive from the base classes under wxGTK too now

[wxWidgets.git] / src / msw / main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 044388d1af91b2a65e736ab1db052dcb1cdbdfa1..3565e7fa23885d4c1922c07c811c8695e2159ecc 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -20,6 +20,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#include "wx/event.h"

 #include "wx/app.h"
 #include <windows.h>
 
 #include "wx/app.h"
 #include <windows.h>
 


@@ -39,15 +40,25 @@
 
 #if !defined(_WINDLL)
 
 
 #if !defined(_WINDLL)
 

+#if defined(__TWIN32__) || defined(__WXWINE__)
+
+extern "C"
+BOOL PASCAL WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+
+#else
+

 #ifdef __WATCOMC__
 int PASCAL
 #else
 int APIENTRY
 #endif
 
 #ifdef __WATCOMC__
 int PASCAL
 #else
 int APIENTRY
 #endif
 

- WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR m_lpCmdLine, int nCmdShow )
+ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
+#endif
+// __TWIN32__
+

 {
 {

-  return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, m_lpCmdLine, nCmdShow);
+  return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, lpCmdLine, nCmdShow);

 }
 #endif
 
 }
 #endif