naming changes

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

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 15a0ac79969bb6905f0be2c19033410f56d8ee55..8f73ba32678c9dd5a2a287944d306d15e5532733 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -23,13 +23,13 @@ class wxCocoaNSWindow
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
-    inline void DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
-    {
-        sm_cocoaHash.erase(cocoaNSWindow);
-    }
+    void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
     virtual void Cocoa_close(void) = 0;
-    virtual bool Cocoa_windowShouldClose(void) = 0;
-    virtual void Cocoa_wxMenuItemAction(wxMenuItem& item) = 0;
+    virtual bool CocoaDelegate_windowShouldClose(void) = 0;
+    virtual void CocoaDelegate_windowDidBecomeKey(void) { }
+    virtual void CocoaDelegate_windowDidResignKey(void) { }
+protected:
+    static struct objc_object *sm_cocoaDelegate;
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_