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

Added a notification observer for NSWindow. Observe the become key and

Browse Source 
resign key notifications. (window activation in wxWindows parlance)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-08-26 19:28:35 +00:00
parent 83f0bdff31
commit 720e01c312
2 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,14 +23,14 @@ class wxCocoaNSWindow
WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow) WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
public: public:
void AssociateNSWindow(WX_NSWindow cocoaNSWindow); void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
inline void DisassociateNSWindow(WX_NSWindow cocoaNSWindow) void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
{
if(cocoaNSWindow)
sm_cocoaHash.erase(cocoaNSWindow);
}
virtual void Cocoa_close(void) = 0; virtual void Cocoa_close(void) = 0;
virtual bool Cocoa_windowShouldClose(void) = 0; virtual bool Cocoa_windowShouldClose(void) = 0;
virtual void Cocoa_wxMenuItemAction(wxMenuItem& item) = 0; virtual void Cocoa_wxMenuItemAction(wxMenuItem& item) = 0;
virtual void CocoaNotification_DidBecomeKey(void) { }
virtual void CocoaNotification_DidResignKey(void) { }
protected:
static void *sm_cocoaObserver;
}; };
#endif // _WX_COCOA_NSWINDOW_H_ #endif // _WX_COCOA_NSWINDOW_H_

52
src/cocoa/NSWindow.mm
View File

@@ -27,18 +27,64 @@
#include "wx/cocoa/NSWindow.h" #include "wx/cocoa/NSWindow.h"
#import <Appkit/NSWindow.h> #import <Appkit/NSWindow.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSString.h>
// ============================================================================
// @class wxNSWindowNotificationObserver
// ============================================================================
@interface wxNSWindowNotificationObserver : NSObject
{
}
- (void)notificationDidBecomeKey: (NSNotification *)notification;
- (void)notificationDidResignKey: (NSNotification *)notification;
@end //interface wxNSWindowNotificationObserver
@implementation wxNSWindowNotificationObserver : NSObject
- (void)notificationDidBecomeKey: (NSNotification *)notification
{
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
win->CocoaNotification_DidBecomeKey();
}
- (void)notificationDidResignKey: (NSNotification *)notification
{
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
win->CocoaNotification_DidResignKey();
}
@end //implementation wxNSWindowNotificationObserver
// ============================================================================
// class wxCocoaNSWindow
// ============================================================================
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow) WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
void *wxCocoaNSWindow::sm_cocoaObserver = [[wxNSWindowNotificationObserver alloc] init];
void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow) void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
{ {
if(cocoaNSWindow) if(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];
[[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationDidResignKey:) name:@"NSWindowDidResignKeyNotification" object:cocoaNSWindow];
}
}
void wxCocoaNSWindow::DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
{
if(cocoaNSWindow)
{
[[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSWindowDidBecomeKeyNotification" object:cocoaNSWindow];
[[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSWindowDidResignKeyNotification" object:cocoaNSWindow];
sm_cocoaHash.erase(cocoaNSWindow);
} }
} }