X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..1a9a6eed360bc9a263f2ea7c0d470953397de531:/include/wx/univ/menuitem.h diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h index 4fe666fc27..d515ce6d7d 100644 --- a/include/wx/univ/menuitem.h +++ b/include/wx/univ/menuitem.h @@ -12,15 +12,11 @@ #ifndef _WX_UNIV_MENUITEM_H_ #define _WX_UNIV_MENUITEM_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univmenuitem.h" -#endif - // ---------------------------------------------------------------------------- // wxMenuItem implements wxMenuItemBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: // ctor & dtor @@ -33,7 +29,7 @@ public: virtual ~wxMenuItem(); // override base class virtuals to update the item appearance on screen - virtual void SetText(const wxString& text); + virtual void SetItemLabel(const wxString& text); virtual void SetCheckable(bool checkable); virtual void Enable(bool enable = true); @@ -98,7 +94,7 @@ protected: // the bitmaps (may be invalid, then they're not used) wxBitmap m_bmpChecked, m_bmpUnchecked, - m_bmpDisabled; + m_bmpDisabled; // the positions of the first and last items of the radio group this item // belongs to or -1: start is the radio group start and is valid for all