X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20d9661c04e34d64dbec300c002d5d1c1f70ad1e..5527476f67f7313aeea0d16b2fe366e5a5ddb493:/include/wx/menuitem.h diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index b804976522..a16e421171 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -34,7 +34,6 @@ class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenuItemBase : public wxObject { public: - // creation static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL, int id = wxID_SEPARATOR, @@ -61,9 +60,12 @@ public: // different from the item's label which only contains the text shown // in the menu virtual void SetText(const wxString& str) { m_text = str; } - virtual wxString GetLabel() const { return m_text; } + 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; } @@ -107,9 +109,14 @@ protected: bool m_isChecked; // is checked? bool m_isEnabled; // is enabled? - // some compilers need a default constructor here, do not use - wxMenuItemBase() - { } + // some compilers need a default constructor here, do not remove + wxMenuItemBase() { } + +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); }; // ----------------------------------------------------------------------------