Remove the Innotek for OS/2 addition...configure now deals with this correctly on...

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index 49027a7e30462aab9f423dad5d49302925afd95f..acf4956d168f8eca866e1b9e261a264cc32b4542 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -107,11 +107,11 @@ public:
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 

-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4

     // Initializes parent pointers and hash table for fast searching.
     // Initializes parent pointers and hash table for fast searching.

-    wxDEPRECATED( static void     InitializeClasses() );
+    wxDEPRECATED( static void InitializeClasses() );

     // Cleans up hash table used for fast searching.
     // Cleans up hash table used for fast searching.

-    wxDEPRECATED( static void     CleanUpClasses() );
+    wxDEPRECATED( static void CleanUpClasses() );

 #endif
     static void     CleanUp();
     
 #endif
     static void     CleanUp();
     


@@ -149,7 +149,7 @@ protected:
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 

-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4

 inline void wxClassInfo::InitializeClasses() {}
 inline void wxClassInfo::CleanUpClasses() {}
 #endif
 inline void wxClassInfo::InitializeClasses() {}
 inline void wxClassInfo::CleanUpClasses() {}
 #endif


@@ -340,20 +340,14 @@ name##PluginSentinel  m_pluginsentinel;
 #define wxDynamicCastThis(className) \
  (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)
 
 #define wxDynamicCastThis(className) \
  (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)
 

-#ifdef HAVE_CONST_CAST
-#define wxConstCast(obj, className) const_cast<className *>(obj)
-#else
-#define wxConstCast(obj, className) ((className *)(obj))
-#endif
-
-

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-inline void wxCheckCast(void *ptr)
+inline void* wxCheckCast(void *ptr)

 {
     wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
 {
     wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );

+    return ptr;

 }
 #define wxStaticCast(obj, className) \
 }
 #define wxStaticCast(obj, className) \

- (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj)))
+ ((className *)wxCheckCast(wxDynamicCast(obj, className)))

 
 #else  // !__WXDEBUG__
 #define wxStaticCast(obj, className) ((className *)(obj))
 
 #else  // !__WXDEBUG__
 #define wxStaticCast(obj, className) ((className *)(obj))