argh, really, really fix Darwin build

[wxWidgets.git] / include / wx / palmos / menuitem.h

diff --git a/include/wx/palmos/menuitem.h b/include/wx/palmos/menuitem.h
index a2c617f18ae445c348fd443b4325be5bca1dd2fd..b9cec3003fca2f23964fe9409118ac437711cfaa 100644 (file)
--- a/include/wx/palmos/menuitem.h
+++ b/include/wx/palmos/menuitem.h
@@ -12,10 +12,6 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menuitem.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -28,7 +24,7 @@
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase

 #if wxUSE_OWNER_DRAWN
                              , public wxOwnerDrawn
 #endif
 #if wxUSE_OWNER_DRAWN
                              , public wxOwnerDrawn
 #endif


@@ -44,7 +40,7 @@ public:
     virtual ~wxMenuItem();
 
     // override base class virtuals
     virtual ~wxMenuItem();
 
     // override base class virtuals

-    virtual void SetText(const wxString& strName);
+    virtual void SetItemLabel(const wxString& strName);

     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = TRUE);
     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = TRUE);