X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..b8ddac49a37a01ca1cf89f97dc97c4945b50ddab:/src/common/init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 390dced3de..2e4b571d1f 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"
@@ -76,13 +77,6 @@ void WXDLLEXPORT wxExit()
     abort();
 }
 
-// Yield to other apps/messages
-bool WXDLLEXPORT wxYield()
-{
-    // do nothing
-    return TRUE;
-}
-
 // Yield to other apps/messages
 void WXDLLEXPORT wxWakeUpIdle()
 {
@@ -158,7 +152,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;
@@ -236,3 +230,5 @@ static void DoCleanUp()
     delete wxLog::SetActiveTarget(NULL);
 #endif // wxUSE_LOG
 }
+
+// vi:sts=4:sw=4:et