X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b199a38dccae76ad59f747dd7ef6fcfc680c089..2dc62891c42229d26e0cb1b5c3fb6e37750c01d3:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index 8f949c0979..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 // ---------------------------------------------------------------------------- @@ -38,15 +34,6 @@ class WXDLLIMPEXP_BASE wxObject; // conditional compilation // ---------------------------------------------------------------------------- -// this shouldn't be needed any longer as 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; @@ -409,9 +396,9 @@ public: virtual ~wxObject() { UnRef(); } wxObject(const wxObject& other) - { - InitFrom(other); - } + { + InitFrom(other); + } wxObject& operator=(const wxObject& other) { @@ -585,5 +572,4 @@ private : #include "wx/msw/msvcrt.h" #endif -#endif // _WX_OBJECTH__ - +#endif // _WX_OBJECTH__