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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 934ba275d2..7af0af2157 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -34,7 +34,7 @@
 #include "wx/init.h"
 #include "wx/thread.h"
 
-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"
 #include "wx/except.h"
 
 #if defined(__WXMSW__) && defined(__WXDEBUG__)
@@ -63,8 +63,9 @@ public:
     wxDummyConsoleApp() { }
 
     virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
+    virtual bool DoYield(bool, long) { return true; }
 
-    DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
+    wxDECLARE_NO_COPY_CLASS(wxDummyConsoleApp);
 };
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
@@ -93,7 +94,7 @@ public:
         wxApp::SetInstance(ptr);
     }
 
-    DECLARE_NO_COPY_CLASS(wxAppPtr)
+    wxDECLARE_NO_COPY_CLASS(wxAppPtr);
 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()
@@ -160,7 +161,7 @@ static struct InitData
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 
-    DECLARE_NO_COPY_CLASS(InitData)
+    wxDECLARE_NO_COPY_CLASS(InitData);
 } gs_initData;
 
 // ============================================================================
@@ -269,7 +270,7 @@ static bool DoCommonPostInit()
         }
 
         // yes; test if it implements Clone() correctly
-        wxEvent* test = dynamic_cast<wxEvent*>(ci->CreateObject());
+        wxEvent* test = wxDynamicCast(ci->CreateObject(),wxEvent);
         if (test == NULL)
         {
             wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!",
@@ -297,9 +298,7 @@ bool wxEntryStart(int& argc, wxChar **argv)
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )
-    {
         return false;
-    }
 
 
     // first of all, we need an application object
@@ -332,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
     // ---------------------------------------------
@@ -483,7 +475,6 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
-
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {