correct test for wxDEBUG_LEVEL in last commit

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 934ba275d2a962242c99da87dda8ca37d277ef58..6e9f06fad8a1dcd7b421e93e14546abd43f621c2 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -34,23 +34,25 @@
 #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"
 
 #include "wx/except.h"
 

-#if defined(__WXMSW__) && defined(__WXDEBUG__)
+#if defined(__WXMSW__)

     #include "wx/msw/msvcrt.h"
 
     #include "wx/msw/msvcrt.h"
 

-    static struct EnableMemLeakChecking
-    {
-        EnableMemLeakChecking()
+    #ifdef wxCrtSetDbgFlag
+        static struct EnableMemLeakChecking

         {
         {

-            // do check for memory leaks on program exit (another useful flag
-            // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated
-            // memory which may be used to simulate low-memory condition)
-            wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
-        }
-    } gs_enableLeakChecks;
-#endif // __WXMSW__ && __WXDEBUG__
+            EnableMemLeakChecking()
+            {
+                // check for memory leaks on program exit (another useful flag
+                // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated
+                // memory which may be used to simulate low-memory condition)
+                wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+            }
+        } gs_enableLeakChecks;
+    #endif // wxCrtSetDbgFlag
+#endif // __WXMSW__

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -63,8 +65,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 +96,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 +163,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;
 
 // ============================================================================


@@ -249,44 +252,6 @@ static bool DoCommonPostInit()
         return false;
     }
 
         return false;
     }
 

-#if defined(__WXDEBUG__)
-    // check if event classes implement Clone() correctly
-    // NOTE: the check is done against _all_ event classes which are linked to
-    //       the executable currently running, which are not necessarily all
-    //       wxWidgets event classes.
-    const wxClassInfo *ci = wxClassInfo::GetFirst();
-    for (; ci; ci = ci->GetNext())
-    {
-        // is this class derived from wxEvent?
-        if (!ci->IsKindOf(CLASSINFO(wxEvent)) || wxString(ci->GetClassName()) == "wxEvent")
-            continue;
-
-        if (!ci->IsDynamic())
-        {
-            wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!",
-                         ci->GetClassName());
-            continue;
-        }
-
-        // yes; test if it implements Clone() correctly
-        wxEvent* test = dynamic_cast<wxEvent*>(ci->CreateObject());
-        if (test == NULL)
-        {
-            wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!",
-                         ci->GetClassName());
-            continue;
-        }
-
-        wxEvent* cloned = test->Clone();
-        if (!cloned || cloned->GetClassInfo() != ci)
-            wxLogWarning("The event class '%s' does not correctly implement Clone()!",
-                         ci->GetClassName());
-
-        delete cloned;
-        delete test;
-    }
-#endif
-

     return true;
 }
 
     return true;
 }
 


@@ -297,9 +262,7 @@ bool wxEntryStart(int& argc, wxChar **argv)
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )

-    {

         return false;
         return false;

-    }

 
 
     // first of all, we need an application object
 
 
     // first of all, we need an application object


@@ -332,22 +295,15 @@ bool wxEntryStart(int& argc, wxChar **argv)
     // --------------------------------------------
 
     if ( !app->Initialize(argc, argv) )
     // --------------------------------------------
 
     if ( !app->Initialize(argc, argv) )

-    {

         return false;
         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;
 
 
     // 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());
 
     wxCallAppCleanup callAppCleanup(app.get());
 

-    // for compatibility call the old initialization function too
-    if ( !app->OnInitGui() )
-        return false;
-

 
     // common initialization after wxTheApp creation
     // ---------------------------------------------
 
     // common initialization after wxTheApp creation
     // ---------------------------------------------


@@ -483,7 +439,6 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
 
     wxTRY
     {

-

         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {