X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be15b995df23c3ca511098676fbdc872f59add80..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/msw/menuitem.h?ds=sidebyside diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index 05a943f6f6..ed147b7cca 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -6,16 +6,12 @@ // 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__ - #pragma interface "menuitem.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -28,7 +24,7 @@ // 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 @@ -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 @@ -57,8 +53,11 @@ public: // the id for a popup menu is really its menu handle (as required by // ::AppendMenu() API), so this function will return either the id or the - // menu handle depending on what we're - int GetRealId() const; + // menu handle depending on what we are + // + // notice that it also returns the id as an unsigned int, as required by + // Win32 API + WXWPARAM GetMSWId() const; // mark item as belonging to the given radio group void SetAsRadioGroupStart(); @@ -79,7 +78,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 +89,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