Menu/toolbar event handling now tries the window with the focus first.

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 1cab1f628e3d828f9251a04e49e51a727bcbc18f..45db41d1194c77b84f7bb6609f1af453c4d07b0a 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -9,6 +9,10 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -16,6 +20,7 @@
 #pragma hdrstop
 #endif
 
+#include "wx/event.h"
 #include "wx/app.h"
 #include <windows.h>
 
@@ -35,15 +40,25 @@
 
 #if !defined(_WINDLL)
 
+#ifdef __TWIN32__
+
+extern "C"
+BOOL PASCAL WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+
+#else
+
 #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