Use a delegate instead of manually adding notifications. Not only is this

less code, but a delegate will be required for future functionality.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index f67430f86837508cac180ba31cff67365b0d49a1..927b80b70ea79871b9722db0dab797e4542f7506 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -29,7 +29,7 @@ public:
     virtual void CocoaNotification_DidBecomeKey(void) { }
     virtual void CocoaNotification_DidResignKey(void) { }
 protected:
     virtual void CocoaNotification_DidBecomeKey(void) { }
     virtual void CocoaNotification_DidResignKey(void) { }
 protected:

-    static void *sm_cocoaObserver;
+    static struct objc_object *sm_cocoaDelegate;

 };
 
 #endif // _WX_COCOA_NSWINDOW_H_
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 27d506a30b3c6a315bcb352044e3c4cca0ac6124..cd1c735fafaafc4f718497c47574341bfa273f65 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -31,33 +31,33 @@
 #import <Foundation/NSString.h>
 
 // ============================================================================
 #import <Foundation/NSString.h>
 
 // ============================================================================

-// @class wxNSWindowNotificationObserver
+// @class wxNSWindowDelegate

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

-@interface wxNSWindowNotificationObserver : NSObject
+@interface wxNSWindowDelegate : NSObject

 {
 }
 
 {
 }
 

-- (void)notificationDidBecomeKey: (NSNotification *)notification;
-- (void)notificationDidResignKey: (NSNotification *)notification;
-@end //interface wxNSWindowNotificationObserver
+- (void)windowDidBecomeKey: (NSNotification *)notification;
+- (void)windowDidResignKey: (NSNotification *)notification;
+@end //interface wxNSWindowDelegate

 
 

-@implementation wxNSWindowNotificationObserver : NSObject
+@implementation wxNSWindowDelegate : NSObject

 
 

-- (void)notificationDidBecomeKey: (NSNotification *)notification
+- (void)windowDidBecomeKey: (NSNotification *)notification

 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
     win->CocoaNotification_DidBecomeKey();
 }
 
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
     win->CocoaNotification_DidBecomeKey();
 }
 

-- (void)notificationDidResignKey: (NSNotification *)notification
+- (void)windowDidResignKey: (NSNotification *)notification

 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
     win->CocoaNotification_DidResignKey();
 }
 
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
     win->CocoaNotification_DidResignKey();
 }
 

-@end //implementation wxNSWindowNotificationObserver
+@end //implementation wxNSWindowDelegate

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


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

-void *wxCocoaNSWindow::sm_cocoaObserver = [[wxNSWindowNotificationObserver alloc] init];
+struct objc_object *wxCocoaNSWindow::sm_cocoaDelegate = [[wxNSWindowDelegate alloc] init];

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


@@ -73,8 +73,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));

-        [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationDidBecomeKey:) name:@"NSWindowDidBecomeKeyNotification" object:cocoaNSWindow];
-        [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationDidResignKey:) name:@"NSWindowDidResignKeyNotification" object:cocoaNSWindow];
+        [cocoaNSWindow setDelegate: sm_cocoaDelegate];

     }
 }
 
     }
 }
 


@@ -82,8 +81,7 @@ void wxCocoaNSWindow::DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
 {
     if(cocoaNSWindow)
     {
 {
     if(cocoaNSWindow)
     {

-        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSWindowDidBecomeKeyNotification" object:cocoaNSWindow];
-        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSWindowDidResignKeyNotification" object:cocoaNSWindow];
+        [cocoaNSWindow setDelegate: nil];

         sm_cocoaHash.erase(cocoaNSWindow);
     }
 }
         sm_cocoaHash.erase(cocoaNSWindow);
     }
 }