Removed previous broken fix for deferred positioning bug, and added

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

diff --git a/include/wx/object.h b/include/wx/object.h
index f8064bdaae9fa54fb5c7ab39bc37187e5b522885..38f714596ca7379be0857ee663d4e7a542aa5c8a 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -391,7 +391,7 @@ inline void* wxCheckCast(void *ptr)
 
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 
 
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 

-#endif // WXDEBUG && wxUSE_MEMORY_TRACING
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING

 
 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWidgets object hierarchy
 
 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWidgets object hierarchy


@@ -468,6 +468,18 @@ public:
     // destroy a reference
     void UnRef();
 
     // destroy a reference
     void UnRef();
 

+
+    // Reserved for future use
+    virtual void ReservedObjectFunc1() {}
+    virtual void ReservedObjectFunc2() {}
+    virtual void ReservedObjectFunc3() {}
+    virtual void ReservedObjectFunc4() {}
+    virtual void ReservedObjectFunc5() {}
+    virtual void ReservedObjectFunc6() {}
+    virtual void ReservedObjectFunc7() {}
+    virtual void ReservedObjectFunc8() {}
+    virtual void ReservedObjectFunc9() {}
+

 protected:
     // ensure that our data is not shared with anybody else: if we have no
     // data, it is created using CreateRefData() below, if we have shared data
 protected:
     // ensure that our data is not shared with anybody else: if we have no
     // data, it is created using CreateRefData() below, if we have shared data