don't ignore the background colour set for the dialog, even although it is a standard...

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 8f842b4b0fcc754b2e91ff69b779ced2b1aa3011..5251f1f34d20bd25c3dde2a9631d3dc3aed7af31 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -34,11 +34,6 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-// Don't implement WinMain if we're building an MFC/wxWidgets hybrid app.
-#if wxUSE_MFC && !defined(NOMAIN)
-    #define NOMAIN 1
-#endif
-

 #ifdef __BORLANDC__
     // BC++ has to be special: its run-time expects the DLL entry point to be
     // named DllEntryPoint instead of the (more) standard DllMain
 #ifdef __BORLANDC__
     // BC++ has to be special: its run-time expects the DLL entry point to be
     // named DllEntryPoint instead of the (more) standard DllMain


@@ -74,12 +69,18 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
 
     // break the command line in words
     wxArrayString args;
 
     // break the command line in words
     wxArrayString args;

+

     const wxChar *cmdLine = ::GetCommandLine();
     if ( cmdLine )
     {
         args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
     }
 
     const wxChar *cmdLine = ::GetCommandLine();
     if ( cmdLine )
     {
         args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
     }
 

+#ifdef __WXWINCE__
+    // WinCE doesn't insert the program itself, so do it ourselves.
+    args.Insert(wxGetFullModuleName(), 0);
+#endif
+

     int argc = args.GetCount();
 
     // +1 here for the terminating NULL
     int argc = args.GetCount();
 
     // +1 here for the terminating NULL


@@ -131,8 +132,8 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
             break;
     }
 #else
             break;
     }
 #else

-       (void)hModule;
-       (void)fdwReason;
+    (void)hModule;
+    (void)fdwReason;

 #endif // !WXMAKINGDLL
 
     return TRUE;
 #endif // !WXMAKINGDLL
 
     return TRUE;


@@ -154,7 +155,7 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
 
 HINSTANCE wxhInstance = 0;
 
 
 HINSTANCE wxhInstance = 0;
 

-HINSTANCE wxGetInstance()
+extern "C" HINSTANCE wxGetInstance()

 {
     return wxhInstance;
 }
 {
     return wxhInstance;
 }