X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74698d3a22d5e611bbcd731a3ade616c66cfaca6..cc77c86d1e71bae248f59f83904971d83e78c1a5:/src/common/init.cpp?ds=sidebyside

diff --git a/src/common/init.cpp b/src/common/init.cpp
index bdbed9efd0..09ae97826c 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -27,6 +27,7 @@
     #include "wx/app.h"
     #include "wx/debug.h"
     #include "wx/filefn.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/module.h"
@@ -48,6 +49,7 @@ class /* no WXDLLEXPORT */ wxConsoleApp : public wxApp
 {
 public:
     virtual int OnRun() { wxFAIL_MSG(wxT("unreachable")); return 0; }
+    virtual bool ProcessIdle() { return TRUE; }
 };
 
 // ----------------------------------------------------------------------------
@@ -109,7 +111,6 @@ bool WXDLLEXPORT wxInitialize()
         return FALSE;
     }
 
-    wxTheApp->DoInit();
     gs_nInitCount++;
 
     return TRUE;
@@ -152,7 +153,7 @@ int wxEntry(int argc, char **argv)
     int mb_argc = 0;
     while (mb_argc < argc)
     {
-        wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
+        wxTheApp->argv[mb_argc] = wxStrdup(wxConvLocal.cMB2WX(argv[mb_argc]));
         mb_argc++;
     }
     wxTheApp->argv[mb_argc] = (wxChar *)NULL;
@@ -230,3 +231,5 @@ static void DoCleanUp()
     delete wxLog::SetActiveTarget(NULL);
 #endif // wxUSE_LOG
 }
+
+// vi:sts=4:sw=4:et