/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSWindow.mm
+// Name: src/cocoa/NSWindow.mm
// Purpose: wxCocoaNSWindow
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows license
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
- (void)windowWillClose: (NSNotification *)notification;
// Menu item handlers
-- (void)wxMenuItemAction: (id)sender;
-- (BOOL)validateMenuItem: (id)menuItem;
+- (void)wxMenuItemAction: (NSMenuItem *)menuItem;
+- (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
@end //interface wxNSWindowDelegate
@implementation wxNSWindowDelegate : NSObject
}
// Menu item handlers
-- (void)wxMenuItemAction: (id)sender
+- (void)wxMenuItemAction: (NSMenuItem *)sender
{
wxASSERT(m_wxCocoaInterface);
m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
}
-- (BOOL)validateMenuItem: (id)sender
+- (BOOL)validateMenuItem: (NSMenuItem *)sender
{
wxASSERT(m_wxCocoaInterface);
return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
-wxCocoaNSWindow::wxCocoaNSWindow()
+wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
+: m_wxTopLevelWindowCocoa(tlw)
{
m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
[m_cocoaDelegate setWxCocoaInterface: this];
{
}
+- (BOOL)canBecomeKeyWindow;
- (BOOL)canBecomeMainWindow;
@end // wxPoserNSwindow
WX_IMPLEMENT_POSER(wxPoserNSWindow);
@implementation wxPoserNSWindow : NSWindow
+- (BOOL)canBecomeKeyWindow
+{
+ bool canBecome = false;
+ wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(self);
+ if(!tlw || !tlw->Cocoa_canBecomeKeyWindow(canBecome))
+ canBecome = [super canBecomeKeyWindow];
+ return canBecome;
+}
+
- (BOOL)canBecomeMainWindow
{
bool canBecome = false;
}
@end // implementation wxPoserNSWindow
-