Added Cocoa_canBecomeKeyWindow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,6 +30,8 @@ class wxCocoaNSWindow
|
|||||||
public:
|
public:
|
||||||
void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
|
void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
|
||||||
void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
|
void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
|
||||||
|
virtual bool Cocoa_canBecomeKeyWindow(bool &canBecome)
|
||||||
|
{ return false; }
|
||||||
virtual bool Cocoa_canBecomeMainWindow(bool &canBecome)
|
virtual bool Cocoa_canBecomeMainWindow(bool &canBecome)
|
||||||
{ return false; }
|
{ return false; }
|
||||||
virtual bool CocoaDelegate_windowShouldClose(void) = 0;
|
virtual bool CocoaDelegate_windowShouldClose(void) = 0;
|
||||||
|
@@ -193,12 +193,22 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL)canBecomeKeyWindow;
|
||||||
- (BOOL)canBecomeMainWindow;
|
- (BOOL)canBecomeMainWindow;
|
||||||
@end // wxPoserNSwindow
|
@end // wxPoserNSwindow
|
||||||
|
|
||||||
WX_IMPLEMENT_POSER(wxPoserNSWindow);
|
WX_IMPLEMENT_POSER(wxPoserNSWindow);
|
||||||
@implementation wxPoserNSWindow : NSWindow
|
@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)canBecomeMainWindow
|
||||||
{
|
{
|
||||||
bool canBecome = false;
|
bool canBecome = false;
|
||||||
|
Reference in New Issue
Block a user