fix a few typos

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 49e211f064ec8f8b8dec40ba8196ef2ad2117c5d..0e76cc4aba51024f7794b66ee564dbfb94c48da7 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/init.h"
 #include "wx/thread.h"
 

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

 #include "wx/except.h"
 
 #if defined(__WXMSW__) && defined(__WXDEBUG__)
 #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; }
     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
 };
 
 // we need a special kind of auto pointer to wxApp which not only deletes the


@@ -93,7 +94,7 @@ public:
         wxApp::SetInstance(ptr);
     }
 
         wxApp::SetInstance(ptr);
     }
 

-    DECLARE_NO_COPY_CLASS(wxAppPtr)
+    wxDECLARE_NO_COPY_CLASS(wxAppPtr);

 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()
 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()


@@ -160,7 +161,7 @@ static struct InitData
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 

-    DECLARE_NO_COPY_CLASS(InitData)
+    wxDECLARE_NO_COPY_CLASS(InitData);

 } gs_initData;
 
 // ============================================================================
 } gs_initData;
 
 // ============================================================================


@@ -269,7 +270,7 @@ static bool DoCommonPostInit()
         }
 
         // yes; test if it implements Clone() correctly
         }
 
         // 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!",
         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());
 
             wxLogWarning("The event class '%s' does not correctly implement Clone()!",
                          ci->GetClassName());
 

+        delete cloned;

         delete test;
     }
 #endif
         delete test;
     }
 #endif