Separate label with wx mnemonics (&) and with gtk mnemonics (_) into m_text and m_gtkText, fixes #4409
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,7 +29,6 @@ public:
|
||||
|
||||
// implement base class virtuals
|
||||
virtual void SetItemLabel( const wxString& str );
|
||||
virtual wxString GetItemLabel() const;
|
||||
virtual void Enable( bool enable = true );
|
||||
virtual void Check( bool check = true );
|
||||
virtual bool IsChecked() const;
|
||||
@@ -48,6 +47,8 @@ public:
|
||||
// and in the hotkey which is used to set given pointer
|
||||
static wxString GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey);
|
||||
|
||||
wxString GetGtkItemLabel() { return m_gtkText; }
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_8
|
||||
// compatibility only, don't use in new code
|
||||
wxDEPRECATED(
|
||||
@@ -68,6 +69,7 @@ private:
|
||||
// style to GTK+ and is called from ctor and SetText()
|
||||
void DoSetText(const wxString& text);
|
||||
|
||||
wxString m_gtkText; // m_text after conversion to GTK mnemonics
|
||||
wxString m_hotKey;
|
||||
wxBitmap m_bitmap; // Bitmap for menuitem, if any
|
||||
|
||||
|
Reference in New Issue
Block a user