include wx/object.h now that wxConfigBase derives from wxObject

[wxWidgets.git] / include / wx / cocoa / ObjcPose.h

diff --git a/include/wx/cocoa/ObjcPose.h b/include/wx/cocoa/ObjcPose.h
index b5e53c0ab6c32dbc54e78f0504609bd6949e60b8..fc430946727a71de0d51319d294b7c2cd9a39bcd 100644 (file)
--- a/include/wx/cocoa/ObjcPose.h
+++ b/include/wx/cocoa/ObjcPose.h
@@ -2,11 +2,11 @@
 // Name:        wx/cocoa/ObjcPose.h
 // Purpose:     Macros for initializing poseAs, among other things
 // Author:      David Elliott
-// Modified by: 
+// Modified by:
 // Created:     2002/12/03
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott <dfe@cox.net>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_PRIVATE_POSER_H__
@@ -17,46 +17,51 @@ 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)
-       {
-               sm_first = this;
-       }
-       ~wxPoseAsInitializer()
-       {
-               class_poseAs(m_poser,m_poser->super_class);
-               sm_first = m_next;
-       }
-       static void InitializePosers()
-       {
-               while(sm_first)
-               {
-                       delete sm_first;
-               }
-       };
+    wxPoseAsInitializer()
+    : m_next(sm_first)
+    {
+        sm_first = this;
+    }
+    virtual ~wxPoseAsInitializer()
+    {
+        sm_first = m_next;
+    }
+    static void InitializePosers()
+    {
+        while(sm_first)
+        {
+            delete sm_first;
+        }
+    };
 protected:
-       Class m_poser;
-       wxPoseAsInitializer *m_next;
-       static wxPoseAsInitializer *sm_first;
+    wxPoseAsInitializer *m_next;
+    static wxPoseAsInitializer *sm_first;
 };
 
 class wxDummyForPoseAsInitializer
 {
 public:
-       wxDummyForPoseAsInitializer(void*) {}
+    wxDummyForPoseAsInitializer(void*) {}
 };
 
 #define WX_IMPLEMENT_POSER(poser) \
-wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsInitializer([poser class]))
+class wxPoseAsInitializerFor##poser: public wxPoseAsInitializer \
+{ \
+protected: \
+    virtual ~wxPoseAsInitializerFor##poser() \
+    { \
+        class_poseAs([poser class],[poser superclass]); \
+    } \
+}; \
+wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsInitializerFor##poser)
 
 #else // __OBJC__
 #warning "Objective-C++ Only!"
 #endif // __OBJC__
 
 #endif // __WX_COCOA_PRIVATE_POSER_H__
-