X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50c375d311ac4cefbf1ae1d11e19c9e7c00a873e..0ce8e27f685bf14f9e37130b3ee9ac9b8b7d692a:/include/wx/os2/menuitem.h?ds=sidebyside diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h index 167812d557..3c726a9226 100644 --- a/include/wx/os2/menuitem.h +++ b/include/wx/os2/menuitem.h @@ -1,26 +1,23 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/os2/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin // Modified by: // 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 // ---------------------------------------------------------------------------- -#include "wx/setup.h" +#include "wx/defs.h" +#include "wx/os2/private.h" // for MENUITEM // an exception to the general rule that a normal header doesn't include other // headers - only because ownerdrw.h is not always included and I don't want @@ -36,62 +33,91 @@ // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem: public wxObject +class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase #if wxUSE_OWNER_DRAWN , public wxOwnerDrawn #endif { -DECLARE_DYNAMIC_CLASS(wxMenuItem) - public: - // ctor & dtor - wxMenuItem(wxMenu *pParentMenu = NULL, int id = ID_SEPARATOR, - const wxString& strName = "", const wxString& wxHelp = "", - bool bCheckable = FALSE, wxMenu *pSubMenu = NULL); - virtual ~wxMenuItem(); - - // accessors (some more are inherited from wxOwnerDrawn or are below) - bool IsSeparator() const { return m_idItem == ID_SEPARATOR; } - bool IsEnabled() const { return m_bEnabled; } - bool IsChecked() const { return m_bChecked; } - bool IsSubMenu() const { return GetSubMenu() != NULL; } - - int GetId() const { return m_idItem; } - const wxString& GetHelp() const { return m_strHelp; } - wxMenu *GetSubMenu() const { return m_pSubMenu; } - - // the id for a popup menu is really its menu handle (as required by - // ::AppendMenu() API) - int GetRealId() const; - - // operations - void SetName(const wxString& strName); - void SetHelp(const wxString& strHelp) { m_strHelp = strHelp; } - - void Enable(bool bDoEnable = TRUE); - void Check(bool bDoCheck = TRUE); - - void DeleteSubMenu(); + // + // ctor & dtor + // + wxMenuItem( wxMenu* pParentMenu = NULL + ,int nId = wxID_SEPARATOR + ,const wxString& rStrName = wxEmptyString + ,const wxString& rWxHelp = wxEmptyString + ,wxItemKind eKind = wxITEM_NORMAL + ,wxMenu* pSubMenu = NULL + ); + + // + // Depricated, do not use in new code + // + wxMenuItem( wxMenu* pParentMenu + ,int vId + ,const wxString& rsText + ,const wxString& rsHelp + ,bool bIsCheckable + ,wxMenu* pSubMenu = NULL + ); + virtual ~wxMenuItem(); + + // + // Override base class virtuals + // + virtual void SetItemLabel(const wxString& rStrName); + virtual void SetCheckable(bool bCheckable); + + virtual void Enable(bool bDoEnable = true); + virtual void Check(bool bDoCheck = true); + virtual bool IsChecked(void) const; + + // + // Unfortunately needed to resolve ambiguity between + // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable() + // + bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); } + + // + // 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(void) const; + + // + // Mark item as belonging to the given radio group + // + void SetAsRadioGroupStart(void); + void SetRadioGroupStart(int nStart); + void SetRadioGroupEnd(int nEnd); + + // + // All OS/2PM Submenus and menus have one of these + // + MENUITEM m_vMenuData; private: - int m_idItem; // numeric id of the item - wxString m_strHelp; // associated help string - wxMenu *m_pSubMenu, // may be NULL - *m_pParentMenu; // menu this item is contained in - bool m_bEnabled, // enabled or greyed? - m_bChecked; // checked? (only if checkable) - -#if wxUSE_OWNER_DRAWN - // wxOwnerDrawn base class already has these variables - nothing to do - -#else //!owner drawn - bool m_bCheckable; // can be checked? - wxString m_strName; // name or label of the item - -public: - const wxString& GetName() const { return m_strName; } - bool IsCheckable() const { return m_bCheckable; } -#endif //owner drawn -}; + void Init(); + + // + // 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 + // only for the first one + // + union + { + int m_nStart; + int m_nEnd; + } m_vRadioGroup; + + // + // Does this item start a radio group? + // + bool m_bIsRadioGroupStart; + + DECLARE_DYNAMIC_CLASS(wxMenuItem) +}; // end of CLASS wxMenuItem #endif //_MENUITEM_H