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 a385775c1e1dcc7c9e1cf02fe2efb752adf1a307..146b9d66b755c9dd46c330cfdd04317ed5d10ec9 100644 (file)
--- a/include/wx/cocoa/NSMenu.h
+++ b/include/wx/cocoa/NSMenu.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
 // Created:     2002/12/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSMENU_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSMENU_H__


@@ -34,6 +34,7 @@ public:
     ,   OBSERVE_DidSendAction       = 0x08
     ,   OBSERVE_WillSendAction      = 0x10
     };
     ,   OBSERVE_DidSendAction       = 0x08
     ,   OBSERVE_WillSendAction      = 0x10
     };

+    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_menuDidAddItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}