Applied patch [ 601072 ] wxFileName::GetLongPath error & fix

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 41b3d29330f87cd820ffa60a49845aff2794fe44..6182c6734f3656c68e9bdd2e58568c86f20525df 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -48,6 +48,7 @@ class /* no WXDLLEXPORT */ wxConsoleApp : public wxApp
 {
 public:
     virtual int OnRun() { wxFAIL_MSG(wxT("unreachable")); return 0; }
 {
 public:
     virtual int OnRun() { wxFAIL_MSG(wxT("unreachable")); return 0; }

+    virtual bool ProcessIdle() { return TRUE; }

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -109,6 +110,7 @@ bool WXDLLEXPORT wxInitialize()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    wxTheApp->DoInit();

     gs_nInitCount++;
 
     return TRUE;
     gs_nInitCount++;
 
     return TRUE;


@@ -151,7 +153,7 @@ int wxEntry(int argc, char **argv)
     int mb_argc = 0;
     while (mb_argc < argc)
     {
     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;
         mb_argc++;
     }
     wxTheApp->argv[mb_argc] = (wxChar *)NULL;