moving focus rect overlap problems to the vis region of a window

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

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 577f1598684bec22797e1390a9399623ee43090f..c2df1cd5e6c26408ac33de7c4a5223814855dd95 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
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -23,69 +23,190 @@
     #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
+#include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSWindow.h"
 
-#import <Appkit/NSWindow.h>
+#import <AppKit/NSWindow.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSString.h>
 
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
+// ============================================================================
+// @class wxNSWindowDelegate
+// ============================================================================
+@interface wxNSWindowDelegate : NSObject
+{
+    wxCocoaNSWindow *m_wxCocoaInterface;
+}
 
-void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
+- (id)init;
+- (void)setWxCocoaInterface: (wxCocoaNSWindow *)wxCocoaInterface;
+- (wxCocoaNSWindow *)wxCocoaInterface;
+
+// Delegate message handlers
+- (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
+
+@implementation wxNSWindowDelegate : NSObject
+
+- (id)init
 {
-    [cocoaNSWindow setReleasedWhenClosed: NO];
-    sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));
+    m_wxCocoaInterface = NULL;
+    return [super init];
 }
 
-// ============================================================================
-// @class wxPoserNSWindow
-// ============================================================================
-@interface wxPoserNSWindow : NSWindow
+- (void)setWxCocoaInterface: (wxCocoaNSWindow *)wxCocoaInterface
 {
+    m_wxCocoaInterface = wxCocoaInterface;
 }
 
-- (void)close;
-- (BOOL)windowShouldClose: (id)sender;
+- (wxCocoaNSWindow *)wxCocoaInterface
+{
+    return m_wxCocoaInterface;
+}
 
-- (BOOL)wxMenuItemAction: (id)sender;
-@end // wxPoserNSwindow
+// Delegate message handlers
+- (void)windowDidBecomeKey: (NSNotification *)notification
+{
+    wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidBecomeKey received but no wxWindow exists"));
+    win->CocoaDelegate_windowDidBecomeKey();
+}
 
-WX_IMPLEMENT_POSER(wxPoserNSWindow);
-@implementation wxPoserNSWindow : NSWindow
+- (void)windowDidResignKey: (NSNotification *)notification
+{
+    wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidResignKey received but no wxWindow exists"));
+    win->CocoaDelegate_windowDidResignKey();
+}
 
-- (void)close
+- (void)windowDidBecomeMain: (NSNotification *)notification
 {
-    wxLogDebug("close");
-    wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
-    if(tlw)
-        tlw->Cocoa_close();
-    [super close];
+    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
 {
-    wxLogDebug("windowShouldClose");
+    wxLogTrace(wxTRACE_COCOA,wxT("windowShouldClose"));
     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);
-    if(tlw && !tlw->Cocoa_windowShouldClose())
+    wxASSERT(tlw==m_wxCocoaInterface);
+    if(tlw && !tlw->CocoaDelegate_windowShouldClose())
+    {
+        wxLogTrace(wxTRACE_COCOA,wxT("Window will not be closed"));
         return NO;
-    wxLogDebug("Window will most likely be CLOSED");
-    if([[wxPoserNSWindow superclass] instancesRespondToSelector:@selector(windowShouldClose:)])
-        return [super windowShouldClose: sender];
+    }
+    wxLogTrace(wxTRACE_COCOA,wxT("Window will be closed"));
     return YES;
 }
 
-- (BOOL)wxMenuItemAction: (id)sender
+- (void)windowWillClose: (NSNotification *)notification
 {
-    wxLogDebug("wxMenuItemAction");
-    wxMenuItem *item = wxMenuItem::GetFromCocoa(sender);
-    if(!item)
-        return NO;
+    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
+
+// ============================================================================
+// class wxCocoaNSWindow
+// ============================================================================
+
+WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
+
+wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
+:   m_wxTopLevelWindowCocoa(tlw)
+{
+    m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
+    [m_cocoaDelegate setWxCocoaInterface: this];
+}
+
+wxCocoaNSWindow::~wxCocoaNSWindow()
+{
+    [m_cocoaDelegate setWxCocoaInterface: NULL];
+    [m_cocoaDelegate release];
+}
+
+void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
+{
+    if(cocoaNSWindow)
+    {
+        [cocoaNSWindow setReleasedWhenClosed: NO];
+        sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));
+        [cocoaNSWindow setDelegate: m_cocoaDelegate];
+    }
+}
+
+void wxCocoaNSWindow::DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
+{
+    if(cocoaNSWindow)
+    {
+        [cocoaNSWindow setDelegate: nil];
+        sm_cocoaHash.erase(cocoaNSWindow);
+    }
+}
 
+wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
+{
+    return NULL;
+}
+
+// ============================================================================
+// @class wxPoserNSWindow
+// ============================================================================
+@interface wxPoserNSWindow : NSWindow
+{
+}
+
+- (BOOL)canBecomeMainWindow;
+@end // wxPoserNSwindow
+
+WX_IMPLEMENT_POSER(wxPoserNSWindow);
+@implementation wxPoserNSWindow : NSWindow
+
+- (BOOL)canBecomeMainWindow
+{
+    bool canBecome = false;
     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
-    wxASSERT(tlw);
-    tlw->Cocoa_wxMenuItemAction(*item);
-    return YES;
+    if(!tlw || !tlw->Cocoa_canBecomeMainWindow(canBecome))
+        canBecome = [super canBecomeMainWindow];
+    return canBecome;
 }
+
 @end // implementation wxPoserNSWindow