set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/cocoa/NSMenu.h b/include/wx/cocoa/NSMenu.h
index c0ce05205eae260dd930d3d7d36118a57b6005e1..146b9d66b755c9dd46c330cfdd04317ed5d10ec9 100644 (file)
--- a/include/wx/cocoa/NSMenu.h
+++ b/include/wx/cocoa/NSMenu.h
@@ -34,11 +34,12 @@ public:
     ,   OBSERVE_DidSendAction       = 0x08
     ,   OBSERVE_WillSendAction      = 0x10
     };
-    void CocoaNotification_menuDidAddItem(WX_NSNotification userInfo) {}
-    void CocoaNotification_menuDidChangeItem(WX_NSNotification userInfo) {}
-    void CocoaNotification_menuDidRemoveItem(WX_NSNotification userInfo) {}
-    void CocoaNotification_menuDidSendAction(WX_NSNotification userInfo) {}
-    void CocoaNotification_menuWillSendAction(WX_NSNotification userInfo) {}
+    virtual void Cocoa_dealloc() {}
+    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;
 };