Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 7152f6c47bb982560b1749ad1c1d7b515d3bd248..fa11d3ad5dfd0427eb613e52456047011fb91b58 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -25,6 +25,8 @@
 
 #include "wx/cocoa/NSWindow.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"
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #include "wx/cocoa/objc/NSWindow.h"


@@ -53,6 +55,7 @@
 - (void)wxMenuItemAction: (NSMenuItem *)menuItem;
 - (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
 @end //interface wxNSWindowDelegate
 - (void)wxMenuItemAction: (NSMenuItem *)menuItem;
 - (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
 @end //interface wxNSWindowDelegate

+WX_DECLARE_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)

 
 @implementation wxNSWindowDelegate : NSObject
 
 
 @implementation wxNSWindowDelegate : NSObject
 


@@ -141,6 +144,7 @@
 }
 
 @end //implementation wxNSWindowDelegate
 }
 
 @end //implementation wxNSWindowDelegate

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)

 
 // ============================================================================
 // class wxCocoaNSWindow
 
 // ============================================================================
 // class wxCocoaNSWindow


@@ -151,7 +155,7 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
 :   m_wxTopLevelWindowCocoa(tlw)
 {
 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];
 }
 
     [m_cocoaDelegate setWxCocoaInterface: this];
 }
 


@@ -209,6 +213,7 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
 }
 
 @end // implementation WXNSWindow
 }
 
 @end // implementation WXNSWindow

+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSWindow,NSWindow)

 
 // ============================================================================
 // @class WXNSPanel
 
 // ============================================================================
 // @class WXNSPanel


@@ -234,3 +239,4 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
 }
 
 @end // implementation WXNSPanel
 }
 
 @end // implementation WXNSPanel

+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSPanel,NSPanel)