glcanvas fix and toplevel event handler exposed

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

diff --git a/include/wx/cocoa/NSMenu.h b/include/wx/cocoa/NSMenu.h
index 354d4738d4da72b599dfc2571c836aa002ee7cfb..4d5df93f2a8ff81fd731b1f8b5ab3ae5a0d0e60e 100644 (file)
--- a/include/wx/cocoa/NSMenu.h
+++ b/include/wx/cocoa/NSMenu.h
@@ -23,7 +23,24 @@ WX_DECLARE_OBJC_HASHMAP(NSMenu);
 
 class wxCocoaNSMenu
 {
-    WX_DECLARE_OBJC_INTERFACE(NSMenu)
+    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSMenu)
+public:
+    void AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags = 0);
+    void DisassociateNSMenu(WX_NSMenu cocoaNSMenu);
+    enum
+    {   OBSERVE_DidAddItem          = 0x01
+    ,   OBSERVE_DidChangeItem       = 0x02
+    ,   OBSERVE_DidRemoveItem       = 0x04
+    ,   OBSERVE_DidSendAction       = 0x08
+    ,   OBSERVE_WillSendAction      = 0x10
+    };
+    virtual void CocoaNotification_menuDidAddItem(WX_NSNotification notification) {}
+    virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification notification) {}
+    virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}
+    virtual void CocoaNotification_menuDidSendAction(WX_NSNotification notification) {}
+    virtual void CocoaNotification_menuWillSendAction(WX_NSNotification notification) {}
+protected:
+    static struct objc_object *sm_cocoaObserver;
 };
 
 #endif // _WX_COCOA_NSMENU_H_