Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index aca0a833060a0d27e5659fb80d0ac4c87fc2d176..561b726ccd2cc0743a1c8886b4922299818febdf 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -38,6 +38,7 @@
 #include "wx/except.h"
 
 #if defined(__WXMSW__)
 #include "wx/except.h"
 
 #if defined(__WXMSW__)

+    #include "wx/msw/private.h"

     #include "wx/msw/msvcrt.h"
 
     #ifdef wxCrtSetDbgFlag
     #include "wx/msw/msvcrt.h"
 
     #ifdef wxCrtSetDbgFlag


@@ -203,8 +204,7 @@ static void FreeConvertedArgs()
             free(gs_initData.argv[i]);
         }
 
             free(gs_initData.argv[i]);
         }
 

-        delete [] gs_initData.argv;
-        gs_initData.argv = NULL;
+        wxDELETEA(gs_initData.argv);

         gs_initData.argc = 0;
     }
 }
         gs_initData.argc = 0;
     }
 }


@@ -238,6 +238,16 @@ static bool DoCommonPreInit()
     wxLog::GetActiveTarget();
 #endif // wxUSE_LOG
 
     wxLog::GetActiveTarget();
 #endif // wxUSE_LOG
 

+#ifdef __WXMSW__
+    // GUI applications obtain HINSTANCE in their WinMain() but we also need to
+    // initialize the global wxhInstance variable for the console programs as
+    // they may need it too, so set it here if it wasn't done yet
+    if ( !wxGetInstance() )
+    {
+        wxSetInstance(::GetModuleHandle(NULL));
+    }
+#endif // __WXMSW__
+

     return true;
 }
 
     return true;
 }