X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dba6b4f88072126c4c3f2684fad18286e5596645..89360a8c873add3f68e05191d9311cc10a49442d:/include/wx/univ/menuitem.h?ds=inline diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h index c0554556a0..da63e3afa0 100644 --- a/include/wx/univ/menuitem.h +++ b/include/wx/univ/menuitem.h @@ -12,10 +12,6 @@ #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 // ---------------------------------------------------------------------------- @@ -36,8 +32,8 @@ public: virtual void SetText(const wxString& text); virtual void SetCheckable(bool checkable); - virtual void Enable(bool enable = TRUE); - virtual void Check(bool check = TRUE); + virtual void Enable(bool enable = true); + virtual void Check(bool check = true); // we add some extra functions which are also available under MSW from // wxOwnerDrawn class - they will be moved to wxMenuItemBase later @@ -45,7 +41,7 @@ public: void SetBitmaps(const wxBitmap& bmpChecked, const wxBitmap& bmpUnchecked = wxNullBitmap); void SetBitmap(const wxBitmap& bmp) { SetBitmaps(bmp); } - const wxBitmap& GetBitmap(bool checked = TRUE) const + const wxBitmap& GetBitmap(bool checked = true) const { return checked ? m_bmpChecked : m_bmpUnchecked; } void SetDisabledBitmap( const wxBitmap& bmpDisabled ) @@ -76,14 +72,14 @@ public: wxCoord GetPosition() const { - wxASSERT_MSG( m_posY != -1, _T("must call SetHeight first!") ); + wxASSERT_MSG( m_posY != wxDefaultCoord, _T("must call SetHeight first!") ); return m_posY; } wxCoord GetHeight() const { - wxASSERT_MSG( m_height != -1, _T("must call SetHeight first!") ); + wxASSERT_MSG( m_height != wxDefaultCoord, _T("must call SetHeight first!") ); return m_height; } @@ -102,7 +98,7 @@ protected: // 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 {