X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/924b84ab9461c95cf5c5386d1091ae0f7a8e7ce7..739b752912e935bfacf1d71ca040d0eb58f2351f:/include/wx/object.h?ds=sidebyside

diff --git a/include/wx/object.h b/include/wx/object.h
index b88a0d850a..d24af71257 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,10 +13,6 @@
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "object.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -26,10 +22,6 @@
 
 class WXDLLIMPEXP_BASE wxObject;
 
-// FIXME: remove in wx-2.7:
-class WXDLLIMPEXP_BASE wxEvent;
-class WXDLLIMPEXP_BASE wxEvtHandler;
-
 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif
@@ -42,15 +34,6 @@ class WXDLLIMPEXP_BASE wxEvtHandler;
 // conditional compilation
 // ----------------------------------------------------------------------------
 
-// this shouldn't be needed any longer as <wx/msw/private.h> does it but it
-// doesn't hurt neither
-#ifdef GetClassName
-#undef GetClassName
-#endif
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
 class WXDLLIMPEXP_BASE wxClassInfo;
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;
@@ -413,9 +396,9 @@ public:
     virtual ~wxObject() { UnRef(); }
 
     wxObject(const wxObject& other)
-        {
-            InitFrom(other);
-        }
+    {
+        InitFrom(other);
+    }
 
     wxObject& operator=(const wxObject& other)
     {
@@ -482,9 +465,7 @@ public:
     virtual void ReservedObjectFunc6() {}
     virtual void ReservedObjectFunc7() {}
     virtual void ReservedObjectFunc8() {}
-    // FIXME: turn back into ReservedObjectFunc9() in wx-2.7 (see also FIXME
-    //        near the top of this file)
-    virtual void DoHandleEvent(void (wxEvtHandler::*)(wxEvent&), wxEvent&) {}
+    virtual void ReservedObjectFunc9() {}
 
 protected:
     // ensure that our data is not shared with anybody else: if we have no
@@ -591,5 +572,4 @@ private :
     #include "wx/msw/msvcrt.h"
 #endif
 
-#endif  // _WX_OBJECTH__
-
+#endif // _WX_OBJECTH__