X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb896a322a2ed53d393ee738765ddd3f72cee004..c7382f913cc2d3ddcc782b876574c58865e7d842:/include/wx/cocoa/ObjcPose.h

diff --git a/include/wx/cocoa/ObjcPose.h b/include/wx/cocoa/ObjcPose.h
index 72ee4903f1..6bfdf45f4b 100644
--- a/include/wx/cocoa/ObjcPose.h
+++ b/include/wx/cocoa/ObjcPose.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/03
 // RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott <dfe@cox.net>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_PRIVATE_POSER_H__
@@ -17,19 +17,18 @@ Objective-C Poser class initialization
 -------------------------------------------------------------------------*/
 #ifdef __OBJC__
 #import <objc/objc-class.h>
+#import <Foundation/NSObjCRuntime.h>
 
 class wxPoseAsInitializer
 {
 public:
-	wxPoseAsInitializer(Class poser)
-	: m_poser(poser)
-	, m_next(sm_first)
+	wxPoseAsInitializer()
+	: m_next(sm_first)
 	{
 		sm_first = this;
 	}
-	~wxPoseAsInitializer()
+	virtual ~wxPoseAsInitializer()
 	{
-		class_poseAs(m_poser,m_poser->super_class);
 		sm_first = m_next;
 	}
 	static void InitializePosers()
@@ -40,7 +39,6 @@ public:
 		}
 	};
 protected:
-	Class m_poser;
 	wxPoseAsInitializer *m_next;
 	static wxPoseAsInitializer *sm_first;
 };
@@ -52,72 +50,19 @@ public:
 };
 
 #define WX_IMPLEMENT_POSER(poser) \
-wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsInitializer([poser class]))
-
-#endif // __OBJC__
-
-/*-------------------------------------------------------------------------
-Basic hashmap stuff, used by everything
--------------------------------------------------------------------------*/
-#define WX_DECLARE_OBJC_HASHMAP(ObjcClass) \
-class wxCocoa##ObjcClass; \
-WX_DECLARE_HASH_MAP(WX_##ObjcClass,wxCocoa##ObjcClass*,wxPointerHash,wxPointerEqual,wxCocoa##ObjcClass##Hash)
-
-#define WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
-public: \
-    static inline wxCocoa##ObjcClass* GetFromCocoa(WX_##ObjcClass cocoaObjcClass) \
-    { \
-        wxCocoa##ObjcClass##Hash::iterator iter = sm_cocoaHash.find(cocoaObjcClass); \
-        if(iter!=sm_cocoaHash.end()) \
-        { \
-            return iter->second; \
-        } \
-        return NULL; \
-    } \
+class wxPoseAsInitializerFor##poser: public wxPoseAsInitializer \
+{ \
 protected: \
-    static wxCocoa##ObjcClass##Hash sm_cocoaHash;
-
-#define WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass) \
-wxCocoa##ObjcClass##Hash wxCocoa##ObjcClass::sm_cocoaHash;
-
-
-/*-------------------------------------------------------------------------
-The entire interface, including some boilerplate stuff
--------------------------------------------------------------------------*/
-#define WX_DECLARE_OBJC_INTERFACE(ObjcClass) \
-WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
-public: \
-    inline void Associate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
+    virtual ~wxPoseAsInitializerFor##poser() \
     { \
-        sm_cocoaHash.insert(wxCocoa##ObjcClass##Hash::value_type(cocoaObjcClass,this)); \
+        class_poseAs([poser class],[poser superclass]); \
     } \
-    inline void Disassociate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
-    { \
-        sm_cocoaHash.erase(cocoaObjcClass); \
-    }
-
-#define WX_IMPLEMENT_OBJC_INTERFACE(ObjcClass) \
-WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass)
+}; \
+wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsInitializerFor##poser)
 
-/*-------------------------------------------------------------------------
-Stuff to be used by the wxWindows class (not the Cocoa interface)
--------------------------------------------------------------------------*/
-#define WX_DECLARE_COCOA_OWNER(ObjcClass,ObjcBase,ObjcRoot) \
-public: \
-    inline WX_##ObjcClass Get##ObjcClass() { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
-    inline const WX_##ObjcClass Get##ObjcClass() const { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
-protected: \
-    void Set##ObjcClass(WX_##ObjcClass cocoaObjcClass);
-
-#define WX_IMPLEMENT_COCOA_OWNER(wxClass,ObjcClass,ObjcBase,ObjcRoot) \
-void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
-{ \
-    if(m_cocoa##ObjcRoot) \
-        Disassociate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
-    Set##ObjcBase(cocoaObjcClass); \
-    if(m_cocoa##ObjcRoot) \
-        Associate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
-}
+#else // __OBJC__
+#warning "Objective-C++ Only!"
+#endif // __OBJC__
 
 #endif // __WX_COCOA_PRIVATE_POSER_H__