fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 0e76cc4aba51024f7794b66ee564dbfb94c48da7..7af0af21578f9bf895608ffc964fa7151b08f283 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -298,9 +298,7 @@ bool wxEntryStart(int& argc, wxChar **argv)
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )
-    {
         return false;
-    }
 
 
     // first of all, we need an application object
@@ -333,22 +331,15 @@ bool wxEntryStart(int& argc, wxChar **argv)
     // --------------------------------------------
 
     if ( !app->Initialize(argc, argv) )
-    {
         return false;
-    }
 
     // remember, possibly modified (e.g. due to removal of toolkit-specific
     // parameters), command line arguments in member variables
     app->argc = argc;
     app->argv = argv;
 
-
     wxCallAppCleanup callAppCleanup(app.get());
 
-    // for compatibility call the old initialization function too
-    if ( !app->OnInitGui() )
-        return false;
-
 
     // common initialization after wxTheApp creation
     // ---------------------------------------------
@@ -484,7 +475,6 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
-
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {