X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a8691eec8df150c13d64593c2200cd1ba83c2d4..2d6dd9c09e7084d402fc923d2f09d8b7158a1a04:/include/wx/cocoa/NSWindow.h?ds=sidebyside

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 7a317209a9..cc62cb2ad1 100644
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSWINDOW_H__
@@ -18,7 +18,7 @@
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxTopLevelWindow;
+class WXDLLEXPORT wxTopLevelWindowCocoa;
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
@@ -30,6 +30,8 @@ class wxCocoaNSWindow
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
+    virtual bool Cocoa_canBecomeKeyWindow(bool &canBecome)
+    {   return false; }
     virtual bool Cocoa_canBecomeMainWindow(bool &canBecome)
     {   return false; }
     virtual bool CocoaDelegate_windowShouldClose(void) = 0;
@@ -41,13 +43,13 @@ public:
     virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
     virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;
     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
-    inline wxTopLevelWindow* GetWxTopLevelWindow()
-    {   return m_wxTopLevelWindow; }
+    inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa()
+    {   return m_wxTopLevelWindowCocoa; }
 protected:
-    wxCocoaNSWindow(wxTopLevelWindow *tlw = NULL);
+    wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL);
     virtual ~wxCocoaNSWindow();
     WX_wxNSWindowDelegate m_cocoaDelegate;
-    wxTopLevelWindow *m_wxTopLevelWindow;
+    wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa;
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_