Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / src / cocoa / NSWindow.mm

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index a18760ee592885f9604ef354564dd6076c2816da..514a35cade86feca91d16d77d2a62bc749db9202 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -4,9 +4,8 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -23,9 +22,10 @@
     #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
-#include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSWindow.h"
 
+#include "wx/cocoa/objc/objc_uniquifying.h"
+
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #include "wx/cocoa/objc/NSWindow.h"
@@ -54,6 +54,7 @@
 - (void)wxMenuItemAction: (NSMenuItem *)menuItem;
 - (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
 @end //interface wxNSWindowDelegate
+WX_DECLARE_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)
 
 @implementation wxNSWindowDelegate : NSObject
 
@@ -142,6 +143,7 @@
 }
 
 @end //implementation wxNSWindowDelegate
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)
 
 // ============================================================================
 // class wxCocoaNSWindow
@@ -152,7 +154,7 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
 :   m_wxTopLevelWindowCocoa(tlw)
 {
-    m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
+    m_cocoaDelegate = [[WX_GET_OBJC_CLASS(wxNSWindowDelegate) alloc] init];
     [m_cocoaDelegate setWxCocoaInterface: this];
 }
 
@@ -210,6 +212,7 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
 }
 
 @end // implementation WXNSWindow
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSWindow,NSWindow)
 
 // ============================================================================
 // @class WXNSPanel
@@ -235,3 +238,4 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
 }
 
 @end // implementation WXNSPanel
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSPanel,NSPanel)