Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
David Elliott
2003-08-29 14:10:23 +00:00
parent 5af11a9413
commit 78c67cb642
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cocoa/NSWindow.h
View File

@@ -29,7 +29,7 @@ public:
virtual void CocoaNotification_DidBecomeKey(void) { } virtual void CocoaNotification_DidBecomeKey(void) { }
virtual void CocoaNotification_DidResignKey(void) { } virtual void CocoaNotification_DidResignKey(void) { }
protected: protected:
static void *sm_cocoaObserver; static struct objc_object *sm_cocoaDelegate;
}; };
#endif // _WX_COCOA_NSWINDOW_H_ #endif // _WX_COCOA_NSWINDOW_H_

26
src/cocoa/NSWindow.mm
View File

@@ -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)windowDidBecomeKey: (NSNotification *)notification;
- (void)notificationDidResignKey: (NSNotification *)notification; - (void)windowDidResignKey: (NSNotification *)notification;
@end //interface wxNSWindowNotificationObserver @end //interface wxNSWindowDelegate
@implementation wxNSWindowNotificationObserver : NSObject @implementation wxNSWindowDelegate : NSObject
- (void)notificationDidBecomeKey: (NSNotification *)notification - (void)windowDidBecomeKey: (NSNotification *)notification
{ {
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]); wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists"); wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
win->CocoaNotification_DidBecomeKey(); win->CocoaNotification_DidBecomeKey();
} }
- (void)notificationDidResignKey: (NSNotification *)notification - (void)windowDidResignKey: (NSNotification *)notification
{ {
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]); wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists"); wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
win->CocoaNotification_DidResignKey(); 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]; [cocoaNSWindow setReleasedWhenClosed: NO];
sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this)); sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));
[[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationDidBecomeKey:) name:@"NSWindowDidBecomeKeyNotification" object:cocoaNSWindow]; [cocoaNSWindow setDelegate: sm_cocoaDelegate];
[[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationDidResignKey:) name:@"NSWindowDidResignKeyNotification" object:cocoaNSWindow];
} }
} }
@@ -82,8 +81,7 @@ void wxCocoaNSWindow::DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
{ {
if(cocoaNSWindow) if(cocoaNSWindow)
{ {
[[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSWindowDidBecomeKeyNotification" object:cocoaNSWindow]; [cocoaNSWindow setDelegate: nil];
[[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSWindowDidResignKeyNotification" object:cocoaNSWindow];
sm_cocoaHash.erase(cocoaNSWindow); sm_cocoaHash.erase(cocoaNSWindow);
} }
} }