Check for null pointer.

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 21466c15ecceef29315124ec0677085a9c25b631..6898c219b9292e326d5eedf2841529e215754b7e 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -30,10 +30,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/bitmap.h"
     #include "wx/intl.h"
     #include "wx/list.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
+    #include "wx/bitmap.h"
+    #include "wx/confbase.h"
 #endif
 
 #include "wx/apptrait.h"
@@ -73,19 +76,11 @@ wxAppBase::wxAppBase()
     m_exitOnFrameDelete = Later;
 }
 
-bool wxAppBase::Initialize(int argc, wxChar **argv)
+bool wxAppBase::Initialize(int& argc, wxChar **argv)
 {
     if ( !wxAppConsole::Initialize(argc, argv) )
         return false;
 
-    // for compatibility call the old initialization function too
-    if ( !OnInitGui() )
-    {
-        wxAppConsole::CleanUp();
-
-        return false;
-    }
-
 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif