X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..60dd3c0916772e3e64fde7c83d359daae02b40a6:/include/wx/msw/menuitem.h diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index d0288b9628..6c6f5885a3 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -12,10 +12,6 @@ #ifndef _MENUITEM_H #define _MENUITEM_H -#ifdef __GNUG__ - #pragma interface "menuitem.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -44,11 +40,11 @@ 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); - virtual void Check(bool bDoCheck = TRUE); + virtual void Enable(bool bDoEnable = true); + virtual void Check(bool bDoCheck = true); virtual bool IsChecked() const; // unfortunately needed to resolve ambiguity between @@ -79,7 +75,7 @@ private: // 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 - // but first radio group items (m_isRadioGroupStart == FALSE), end is valid + // but first radio group items (m_isRadioGroupStart == false), end is valid // only for the first one union { @@ -90,7 +86,7 @@ private: // does this item start a radio group? bool m_isRadioGroupStart; - DECLARE_DYNAMIC_CLASS(wxMenuItem) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem) }; #endif //_MENUITEM_H