added wxDC::GetHDC() for backwards compatibility with the existing wxMSW code

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

diff --git a/include/wx/palmos/menuitem.h b/include/wx/palmos/menuitem.h
index bf44cca90f730d97ca2dd7b0d990712c8ba1b60c..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
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menuitem.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -28,7 +24,7 @@
 // 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
@@ -44,7 +40,7 @@ public:
     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);
@@ -55,11 +51,6 @@ public:
     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
     bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); }
 
-    // the id for a popup menu is really its menu handle (as required by
-    // ::AppendMenu() API), so this function will return either the id or the
-    // menu handle depending on what we're
-    int GetRealId() const;
-
     // mark item as belonging to the given radio group
     void SetAsRadioGroupStart();
     void SetRadioGroupStart(int start);