no real change: put event handlers together at the end of the file

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 49e211f064ec8f8b8dec40ba8196ef2ad2117c5d..2450ec403360c6d2c595b54a0b63d6e3b0450aeb 100644 (file)
--- 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,6 +63,7 @@ public:
     wxDummyConsoleApp() { }
 
     virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
+    virtual bool DoYield(bool, long) { return true; }
 
     DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
 };
@@ -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!",
@@ -282,6 +283,7 @@ static bool DoCommonPostInit()
             wxLogWarning("The event class '%s' does not correctly implement Clone()!",
                          ci->GetClassName());
 
+        delete cloned;
         delete test;
     }
 #endif