don't deprecate the entire wxDrawObject class, this results in warnings when we just...

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

diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h
index 21ceed2f327685128c28df81e74c0348c8f5510e..fbcbc08a596d68025c28e37c6301af353ea84145 100644 (file)
--- a/include/wx/cocoa/menu.h
+++ b/include/wx/cocoa/menu.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
 // wxMenu
 // ========================================================================
 
-class WXDLLEXPORT wxMenu : public wxMenuBase, public wxCocoaNSMenu
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase, public wxCocoaNSMenu
 {
 public:
     // ctors and dtor
@@ -73,7 +73,7 @@ private:
 // ========================================================================
 // wxMenuBar
 // ========================================================================
-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
 {
 public:
     // ctors and dtor
@@ -102,8 +102,8 @@ public:
     virtual void EnableTop(size_t pos, bool enable);
     virtual bool IsEnabledTop(size_t pos) const;
 
-    virtual void SetLabelTop(size_t pos, const wxString& label);
-    virtual wxString GetLabelTop(size_t pos) const;
+    virtual void SetMenuLabel(size_t pos, const wxString& label);
+    virtual wxString GetMenuLabel(size_t pos) const;
 
     virtual void Attach(wxFrame *frame);
     virtual void Detach();