using newer API

[wxWidgets.git] / include / wx / cocoa / NSWindow.h

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 04da760edc8e25e21bc882a3b8c0683ca4d7efa0..cc62cb2ad10ca161934ec9bd6ee88d0d2e5a984e 100644 (file)
--- 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__
@@ -17,20 +17,39 @@
 
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
+class WXDLLEXPORT wxMenuBar;
+class WXDLLEXPORT wxTopLevelWindowCocoa;
+
+DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
+DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
+
 class wxCocoaNSWindow
 {
 /* NSWindow is a rather special case and requires some extra attention */
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
-    inline void DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
-    {
-        if(cocoaNSWindow)
-            sm_cocoaHash.erase(cocoaNSWindow);
-    }
-    virtual void Cocoa_close(void) = 0;
-    virtual bool Cocoa_windowShouldClose(void) = 0;
-    virtual void Cocoa_wxMenuItemAction(wxMenuItem& item) = 0;
+    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;
+    virtual void CocoaDelegate_windowWillClose(void) = 0;
+    virtual void CocoaDelegate_windowDidBecomeKey(void) { }
+    virtual void CocoaDelegate_windowDidResignKey(void) { }
+    virtual void CocoaDelegate_windowDidBecomeMain(void) { }
+    virtual void CocoaDelegate_windowDidResignMain(void) { }
+    virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
+    virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;
+    virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
+    inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa()
+    {   return m_wxTopLevelWindowCocoa; }
+protected:
+    wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL);
+    virtual ~wxCocoaNSWindow();
+    WX_wxNSWindowDelegate m_cocoaDelegate;
+    wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa;
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_