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 cd1c735fafaafc4f718497c47574341bfa273f65..fa11d3ad5dfd0427eb613e52456047011fb91b58 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/NSWindow.mm
+// Name:        src/cocoa/NSWindow.mm

 // Purpose:     wxCocoaNSWindow
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Purpose:     wxCocoaNSWindow
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -23,41 +23,128 @@
     #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
     #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 

-#include "wx/cocoa/ObjcPose.h"

 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/cocoa/NSWindow.h"
 

-#import <Appkit/NSWindow.h>
+#include "wx/cocoa/objc/objc_uniquifying.h"
+

 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>

+#include "wx/cocoa/objc/NSWindow.h"

 
 // ============================================================================
 // @class wxNSWindowDelegate
 // ============================================================================
 @interface wxNSWindowDelegate : NSObject
 {
 
 // ============================================================================
 // @class wxNSWindowDelegate
 // ============================================================================
 @interface wxNSWindowDelegate : NSObject
 {

+    wxCocoaNSWindow *m_wxCocoaInterface;

 }
 
 }
 

+- (id)init;
+- (void)setWxCocoaInterface: (wxCocoaNSWindow *)wxCocoaInterface;
+- (wxCocoaNSWindow *)wxCocoaInterface;
+
+// Delegate message handlers

 - (void)windowDidBecomeKey: (NSNotification *)notification;
 - (void)windowDidResignKey: (NSNotification *)notification;
 - (void)windowDidBecomeKey: (NSNotification *)notification;
 - (void)windowDidResignKey: (NSNotification *)notification;

+- (void)windowDidBecomeMain: (NSNotification *)notification;
+- (void)windowDidResignMain: (NSNotification *)notification;
+- (BOOL)windowShouldClose: (id)sender;
+- (void)windowWillClose: (NSNotification *)notification;
+
+// Menu item handlers
+- (void)wxMenuItemAction: (NSMenuItem *)menuItem;
+- (BOOL)validateMenuItem: (NSMenuItem *)menuItem;

 @end //interface wxNSWindowDelegate
 @end //interface wxNSWindowDelegate

+WX_DECLARE_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)

 
 @implementation wxNSWindowDelegate : NSObject
 
 
 @implementation wxNSWindowDelegate : NSObject
 

+- (id)init
+{
+    m_wxCocoaInterface = NULL;
+    return [super init];
+}
+
+- (void)setWxCocoaInterface: (wxCocoaNSWindow *)wxCocoaInterface
+{
+    m_wxCocoaInterface = wxCocoaInterface;
+}
+
+- (wxCocoaNSWindow *)wxCocoaInterface
+{
+    return m_wxCocoaInterface;
+}
+
+// Delegate message handlers

 - (void)windowDidBecomeKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
 - (void)windowDidBecomeKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
-    win->CocoaNotification_DidBecomeKey();
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidBecomeKey received but no wxWindow exists"));
+    win->CocoaDelegate_windowDidBecomeKey();

 }
 
 - (void)windowDidResignKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
 }
 
 - (void)windowDidResignKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
-    win->CocoaNotification_DidResignKey();
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidResignKey received but no wxWindow exists"));
+    win->CocoaDelegate_windowDidResignKey();
+}
+
+- (void)windowDidBecomeMain: (NSNotification *)notification
+{
+    wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidBecomeMain received but no wxWindow exists"));
+    win->CocoaDelegate_windowDidBecomeMain();
+}
+
+- (void)windowDidResignMain: (NSNotification *)notification
+{
+    wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidResignMain received but no wxWindow exists"));
+    win->CocoaDelegate_windowDidResignMain();
+}
+
+- (BOOL)windowShouldClose: (id)sender
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("windowShouldClose"));
+    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);
+    wxASSERT(tlw==m_wxCocoaInterface);
+    if(tlw && !tlw->CocoaDelegate_windowShouldClose())
+    {
+        wxLogTrace(wxTRACE_COCOA,wxT("Window will not be closed"));
+        return NO;
+    }
+    wxLogTrace(wxTRACE_COCOA,wxT("Window will be closed"));
+    return YES;
+}
+
+- (void)windowWillClose: (NSNotification *)notification
+{
+    wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("windowWillClose received but no wxWindow exists"));
+    win->CocoaDelegate_windowWillClose();
+}
+
+// Menu item handlers
+- (void)wxMenuItemAction: (NSMenuItem *)sender
+{
+    wxASSERT(m_wxCocoaInterface);
+    m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
+}
+
+- (BOOL)validateMenuItem: (NSMenuItem *)sender
+{
+    wxASSERT(m_wxCocoaInterface);
+    return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);

 }
 
 @end //implementation wxNSWindowDelegate
 }
 
 @end //implementation wxNSWindowDelegate

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject)

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


@@ -65,7 +152,18 @@
 
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 
 
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 

-struct objc_object *wxCocoaNSWindow::sm_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
+wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
+:   m_wxTopLevelWindowCocoa(tlw)
+{
+    m_cocoaDelegate = [[WX_GET_OBJC_CLASS(wxNSWindowDelegate) alloc] init];
+    [m_cocoaDelegate setWxCocoaInterface: this];
+}
+
+wxCocoaNSWindow::~wxCocoaNSWindow()
+{
+    [m_cocoaDelegate setWxCocoaInterface: NULL];
+    [m_cocoaDelegate release];
+}

 
 void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
 {
 
 void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
 {


@@ -73,7 +171,7 @@ void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
     {
         [cocoaNSWindow setReleasedWhenClosed: NO];
         sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));
     {
         [cocoaNSWindow setReleasedWhenClosed: NO];
         sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));

-        [cocoaNSWindow setDelegate: sm_cocoaDelegate];
+        [cocoaNSWindow setDelegate: m_cocoaDelegate];

     }
 }
 
     }
 }
 


@@ -86,41 +184,59 @@ void wxCocoaNSWindow::DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
     }
 }
 
     }
 }
 

+wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
+{
+    return NULL;
+}
+

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

-// @class wxPoserNSWindow
+// @class WXNSWindow

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

-@interface wxPoserNSWindow : NSWindow
+@implementation WXNSWindow : NSWindow
+
+- (BOOL)canBecomeKeyWindow

 {
 {

+    bool canBecome = false;
+    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
+    if(!tlw || !tlw->Cocoa_canBecomeKeyWindow(canBecome))
+        canBecome = [super canBecomeKeyWindow];
+    return canBecome;

 }
 
 }
 

-- (void)close;
-- (BOOL)windowShouldClose: (id)sender;
+- (BOOL)canBecomeMainWindow
+{
+    bool canBecome = false;
+    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
+    if(!tlw || !tlw->Cocoa_canBecomeMainWindow(canBecome))
+        canBecome = [super canBecomeMainWindow];
+    return canBecome;
+}

 
 

-@end // wxPoserNSwindow
+@end // implementation WXNSWindow
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSWindow,NSWindow)

 
 

-WX_IMPLEMENT_POSER(wxPoserNSWindow);
-@implementation wxPoserNSWindow : NSWindow
+// ============================================================================
+// @class WXNSPanel
+// ============================================================================
+@implementation WXNSPanel : NSPanel

 
 

-- (void)close
+- (BOOL)canBecomeKeyWindow

 {
 {

-    wxLogDebug("close");
+    bool canBecome = false;

     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);

-    if(tlw)
-        tlw->Cocoa_close();
-    [super close];
+    if(!tlw || !tlw->Cocoa_canBecomeKeyWindow(canBecome))
+        canBecome = [super canBecomeKeyWindow];
+    return canBecome;

 }
 
 }
 

-- (BOOL)windowShouldClose: (id)sender
+- (BOOL)canBecomeMainWindow

 {
 {

-    wxLogDebug("windowShouldClose");
-    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);
-    if(tlw && !tlw->Cocoa_windowShouldClose())
-        return NO;
-    wxLogDebug("Window will most likely be CLOSED");
-    if([[wxPoserNSWindow superclass] instancesRespondToSelector:@selector(windowShouldClose:)])
-        return [super windowShouldClose: sender];
-    return YES;
+    bool canBecome = false;
+    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
+    if(!tlw || !tlw->Cocoa_canBecomeMainWindow(canBecome))
+        canBecome = [super canBecomeMainWindow];
+    return canBecome;

 }
 
 }
 

-@end // implementation wxPoserNSWindow
-
+@end // implementation WXNSPanel
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSPanel,NSPanel)