X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/974e8d946f30af2bd79b9029d1d2fb9e0d5b2dd4..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/menuitem.h?ds=sidebyside diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index ea5ac56053..b8d23c5edd 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -12,27 +12,19 @@ #ifndef _WX_MENUITEM_H_BASE_ #define _WX_MENUITEM_H_BASE_ +#if wxUSE_MENUS + // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- #include "wx/object.h" // base class -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// id for a separator line in the menu (invalid for normal item) -#define wxID_SEPARATOR (-1) - -#ifndef ID_SEPARATOR // for compatibility only, don't use in new code - #define ID_SEPARATOR wxID_SEPARATOR -#endif - // ---------------------------------------------------------------------------- // forward declarations // ---------------------------------------------------------------------------- +class WXDLLEXPORT wxAcceleratorEntry; class WXDLLEXPORT wxMenuItem; class WXDLLEXPORT wxMenu; @@ -49,21 +41,39 @@ public: int id = wxID_SEPARATOR, const wxString& text = wxEmptyString, const wxString& help = wxEmptyString, - bool isCheckable = FALSE, + wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); + // destruction: wxMenuItem will delete its submenu + virtual ~wxMenuItemBase(); + + // the menu we're in + wxMenu *GetMenu() const { return m_parentMenu; } + // get/set id void SetId(int id) { m_id = id; } int GetId() const { return m_id; } bool IsSeparator() const { return m_id == wxID_SEPARATOR; } - // the item's text (or name, or label...) + // the item's text (or name) + // + // NB: the item's text includes the accelerators and mnemonics info (if + // any), i.e. it may contain '&' or '_' or "\t..." and thus is + // different from the item's label which only contains the text shown + // in the menu virtual void SetText(const wxString& str) { m_text = str; } + wxString GetLabel() const { return GetLabelFromText(m_text); } const wxString& GetText() const { return m_text; } + // get the label from text (implemented in platform-specific code) + static wxString GetLabelFromText(const wxString& text); + // what kind of menu item we are - virtual void SetCheckable(bool checkable) { m_isCheckable = checkable; } - bool IsCheckable() const { return m_isCheckable; } + wxItemKind GetKind() const { return m_kind; } + + virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; } + bool IsCheckable() const + { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; } bool IsSubMenu() const { return m_subMenu != NULL; } void SetSubMenu(wxMenu *menu) { m_subMenu = menu; } @@ -72,26 +82,66 @@ public: // state virtual void Enable(bool enable = TRUE) { m_isEnabled = enable; } virtual bool IsEnabled() const { return m_isEnabled; } + virtual void Check(bool check = TRUE) { m_isChecked = check; } virtual bool IsChecked() const { return m_isChecked; } + void Toggle() { Check(!m_isChecked); } // help string (displayed in the status bar by default) void SetHelp(const wxString& str) { m_help = str; } const wxString& GetHelp() const { return m_help; } +#if wxUSE_ACCEL + // extract the accelerator from the given menu string, return NULL if none + // found + static wxAcceleratorEntry *GetAccelFromString(const wxString& label); + + // get our accelerator or NULL (caller must delete the pointer) + virtual wxAcceleratorEntry *GetAccel() const; + + // set the accel for this item - this may also be done indirectly with + // SetText() + virtual void SetAccel(wxAcceleratorEntry *accel); +#endif // wxUSE_ACCEL + // compatibility only, use new functions in the new code void SetName(const wxString& str) { SetText(str); } const wxString& GetName() const { return GetText(); } + static wxMenuItem *New(wxMenu *parentMenu, + int id, + const wxString& text, + const wxString& help, + bool isCheckable, + wxMenu *subMenu = (wxMenu *)NULL) + { + return New(parentMenu, id, text, help, + isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu); + } + protected: int m_id; // numeric id of the item >= 0 or -1 wxMenu *m_parentMenu, // the menu we belong to *m_subMenu; // our sub menu or NULL wxString m_text, // label of the item m_help; // the help string for the item - bool m_isCheckable; // can be checked? + wxItemKind m_kind; // seperator/normal/check/radio item? bool m_isChecked; // is checked? bool m_isEnabled; // is enabled? + + // this ctor is for the derived classes only, we're never created directly + wxMenuItemBase(wxMenu *parentMenu = (wxMenu *)NULL, + int id = wxID_SEPARATOR, + const wxString& text = wxEmptyString, + const wxString& help = wxEmptyString, + wxItemKind kind = wxITEM_NORMAL, + wxMenu *subMenu = (wxMenu *)NULL); + +private: + // and, if we have one ctor, compiler won't generate a default copy one, so + // declare them ourselves - but don't implement as they shouldn't be used + wxMenuItemBase(const wxMenuItemBase& item); + wxMenuItemBase& operator=(const wxMenuItemBase& item); }; // ---------------------------------------------------------------------------- @@ -101,14 +151,14 @@ protected: #ifdef wxUSE_BASE_CLASSES_ONLY #define wxMenuItem wxMenuItemBase #else // !wxUSE_BASE_CLASSES_ONLY -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + #include "wx/univ/menuitem.h" +#elif defined(__WXMSW__) #include "wx/msw/menuitem.h" #elif defined(__WXMOTIF__) #include "wx/motif/menuitem.h" #elif defined(__WXGTK__) #include "wx/gtk/menuitem.h" -#elif defined(__WXQT__) - #include "wx/qt/menuitem.h" #elif defined(__WXMAC__) #include "wx/mac/menuitem.h" #elif defined(__WXPM__) @@ -118,5 +168,7 @@ protected: #endif #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY +#endif // wxUSE_MENUS + #endif // _WX_MENUITEM_H_BASE_