X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2368dcda39f732b2812683b44d2d8f0449c4c055..77ec05d4776a5210c766fcd4b6b2c63a23b1f86a:/include/wx/msw/menuitem.h diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index 33f293efdc..1fdaa5686a 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -6,13 +6,13 @@ // Created: 11.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _MENUITEM_H #define _MENUITEM_H -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "menuitem.h" #endif @@ -47,8 +47,8 @@ public: virtual void SetText(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 @@ -61,11 +61,9 @@ public: int GetRealId() const; // mark item as belonging to the given radio group - void SetRadioGroup(int start, int end) - { - m_startRadioGroup = start; - m_endRadioGroup = end; - } + void SetAsRadioGroupStart(); + void SetRadioGroupStart(int start); + void SetRadioGroupEnd(int end); // compatibility only, don't use in new code wxMenuItem(wxMenu *parentMenu, @@ -80,11 +78,19 @@ private: void Init(); // the positions of the first and last items of the radio group this item - // belongs to or -1 - int m_startRadioGroup, - m_endRadioGroup; + // 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 + // only for the first one + union + { + int start; + int end; + } m_radioGroup; + + // does this item start a radio group? + bool m_isRadioGroupStart; - DECLARE_DYNAMIC_CLASS(wxMenuItem) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem) }; #endif //_MENUITEM_H