X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..f66553919504e2d24a1846960a547ff1fd52eb67:/include/wx/menuitem.h diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index 0f4b2816f3..1f98a5d1ee 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -6,12 +6,14 @@ // Created: 25.10.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_MENUITEM_H_BASE_ #define _WX_MENUITEM_H_BASE_ +#include "wx/defs.h" + #if wxUSE_MENUS // ---------------------------------------------------------------------------- @@ -24,16 +26,16 @@ // forward declarations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorEntry; -class WXDLLEXPORT wxMenuItem; -class WXDLLEXPORT wxMenu; +class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry; +class WXDLLIMPEXP_FWD_CORE wxMenuItem; +class WXDLLIMPEXP_FWD_CORE wxMenu; // ---------------------------------------------------------------------------- // wxMenuItem is an item in the menu which may be either a normal item, a sub // menu or a separator // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItemBase : public wxObject +class WXDLLIMPEXP_CORE wxMenuItemBase : public wxObject { public: // creation @@ -54,24 +56,31 @@ public: // get/set id void SetId(int itemid) { m_id = itemid; } int GetId() const { return m_id; } - bool IsSeparator() const { return m_id == wxID_SEPARATOR; } // the item's text (or name) // - // NB: the item's text includes the accelerators and mnemonics info (if + // NB: the item's label 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; } + // different from the item's text which only contains the text shown + // in the menu. This used to be called SetText. + virtual void SetItemLabel(const wxString& str); + + // return the item label including any mnemonics and accelerators. + // This used to be called GetText. + virtual wxString GetItemLabel() const { return m_text; } + + // return just the text of the item label, without any mnemonics + // This used to be called GetLabel. + virtual wxString GetItemLabelText() const { return GetLabelText(m_text); } - // get the label from text (implemented in platform-specific code) - static wxString GetLabelFromText(const wxString& text); + // return just the text part of the given label (implemented in platform-specific code) + // This used to be called GetLabelFromText. + static wxString GetLabelText(const wxString& label); // what kind of menu item we are wxItemKind GetKind() const { return m_kind; } void SetKind(wxItemKind kind) { m_kind = kind; } + bool IsSeparator() const { return m_kind == wxITEM_SEPARATOR; } virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; } bool IsCheckable() const @@ -82,15 +91,15 @@ public: wxMenu *GetSubMenu() const { return m_subMenu; } // state - virtual void Enable(bool enable = TRUE) { m_isEnabled = enable; } + 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 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; } + void SetHelp(const wxString& str); const wxString& GetHelp() const { return m_help; } #if wxUSE_ACCEL @@ -106,9 +115,23 @@ public: virtual void SetAccel(wxAcceleratorEntry *accel); #endif // wxUSE_ACCEL +#if WXWIN_COMPATIBILITY_2_8 // compatibility only, use new functions in the new code - void SetName(const wxString& str) { SetText(str); } - const wxString& GetName() const { return GetText(); } + wxDEPRECATED( void SetName(const wxString& str) ); + wxDEPRECATED( wxString GetName() const ); + + // Now use GetItemLabelText + wxDEPRECATED( wxString GetLabel() const ) ; + + // Now use GetItemLabel + wxDEPRECATED( const wxString& GetText() const ); + + // Now use GetLabelText to strip the accelerators + wxDEPRECATED( static wxString GetLabelFromText(const wxString& text) ); + + // Now use SetItemLabel + wxDEPRECATED( virtual void SetText(const wxString& str) ); +#endif // WXWIN_COMPATIBILITY_2_8 static wxMenuItem *New(wxMenu *parentMenu, int itemid, @@ -122,12 +145,12 @@ public: } protected: - int m_id; // numeric id of the item >= 0 or -1 + wxWindowIDRef m_id; // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR 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 - wxItemKind m_kind; // seperator/normal/check/radio item? + wxItemKind m_kind; // separator/normal/check/radio item? bool m_isChecked; // is checked? bool m_isEnabled; // is enabled? @@ -146,6 +169,17 @@ private: wxMenuItemBase& operator=(const wxMenuItemBase& item); }; +#if WXWIN_COMPATIBILITY_2_8 +inline void wxMenuItemBase::SetName(const wxString &str) + { SetItemLabel(str); } +inline wxString wxMenuItemBase::GetName() const + { return GetItemLabel(); } +inline wxString wxMenuItemBase::GetLabel() const + { return GetLabelText(m_text); } +inline const wxString& wxMenuItemBase::GetText() const { return m_text; } +inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); } +#endif // WXWIN_COMPATIBILITY_2_8 + // ---------------------------------------------------------------------------- // include the real class declaration // ---------------------------------------------------------------------------- @@ -155,14 +189,18 @@ private: #else // !wxUSE_BASE_CLASSES_ONLY #if defined(__WXUNIVERSAL__) #include "wx/univ/menuitem.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/menuitem.h" #elif defined(__WXMSW__) #include "wx/msw/menuitem.h" #elif defined(__WXMOTIF__) #include "wx/motif/menuitem.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/menuitem.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/menuitem.h" #elif defined(__WXMAC__) - #include "wx/mac/menuitem.h" + #include "wx/osx/menuitem.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/menuitem.h" #elif defined(__WXPM__)