X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1e10a22b6a2f859d23024bdb57f84665f66f89e..3a6a00822d9930aab713b4fa924ad7d12798b9a3:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 301b632556..e04a3e4f3d 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -21,18 +21,19 @@
     #include "wx/object.h"
     #include "wx/hash.h"
     #include "wx/memory.h"
+    #include "wx/crt.h"
 #endif
 
 #include <string.h>
 
-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_DEBUG_CONTEXT
     #if defined(__VISAGECPP__)
         #define DEBUG_PRINTF(NAME) { static int raz=0; \
             printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
     #else
         #define DEBUG_PRINTF(NAME)
     #endif
-#endif // __WXDEBUG__ || wxUSE_DEBUG_CONTEXT
+#endif // wxUSE_DEBUG_CONTEXT
 
 // we must disable optimizations for VC.NET because otherwise its too eager
 // linker discards wxClassInfo objects in release build thus breaking many,
@@ -52,7 +53,7 @@ const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
  wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"),
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,
-            (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,
+            NULL,NULL,0 , 0 ,
             0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);
  template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
@@ -96,13 +97,13 @@ const bool wxFalse = false;
 // E.g. is wxWindow a kind of wxObject?
 // Go from this class to superclass, taking into account
 // two possible base classes.
-bool wxObject::IsKindOf(wxClassInfo *info) const
+bool wxObject::IsKindOf(const wxClassInfo *info) const
 {
-    wxClassInfo *thisInfo = GetClassInfo();
+    const wxClassInfo *thisInfo = GetClassInfo();
     return (thisInfo) ? thisInfo->IsKindOf(info) : false ;
 }
 
-#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
+#if wxUSE_MEMORY_TRACING && defined( new )
     #undef new
 #endif
 
@@ -224,11 +225,11 @@ void wxClassInfo::Register()
             sm_classTable = classTable;
     }
 
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
     // reentrance guard - see note above
     static int entry = 0;
     wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance"));
-#endif
+#endif // wxDEBUG_LEVEL
 
     // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
     // link any object module twice mistakenly, or link twice against wx shared
@@ -245,9 +246,9 @@ void wxClassInfo::Register()
 
     sm_classTable->Put(m_className, (wxObject *)this);
 
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
     --entry;
-#endif
+#endif // wxDEBUG_LEVEL
 }
 
 void wxClassInfo::Unregister()
@@ -265,7 +266,7 @@ void wxClassInfo::Unregister()
 
 wxObject *wxCreateDynamicObject(const wxString& name)
 {
-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_DEBUG_CONTEXT
     DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
 #endif
 
@@ -337,7 +338,7 @@ void wxObjectRefData::DecRef()
 
 void wxObject::Ref(const wxObject& clone)
 {
-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+#if wxUSE_DEBUG_CONTEXT
     DEBUG_PRINTF(wxObject::Ref)
 #endif