X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17131ffd751235d115e1ee3f1b38a88b5858d13e..f1a73c6a816aeba155e88c628a0a778a2fe068bd:/include/wx/palmos/menuitem.h?ds=inline diff --git a/include/wx/palmos/menuitem.h b/include/wx/palmos/menuitem.h index a2c617f18a..b49dc215bd 100644 --- 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,23 +24,23 @@ // 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 { public: // ctor & dtor - wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL, + wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& name = wxEmptyString, const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = (wxMenu *)NULL); + wxMenu *subMenu = NULL); 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); @@ -66,7 +62,7 @@ public: const wxString& text, const wxString& help, bool isCheckable, - wxMenu *subMenu = (wxMenu *)NULL); + wxMenu *subMenu = NULL); private: // common part of all ctors