use memcpy() instead of wxTmemcpy() as the latter is defined in wx/wxcrt.h which...

[wxWidgets.git] / include / wx / gtk / menuitem.h

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index dbc24b2d885577fb96779ca66363d1a31baab1e7..bc5c7a8fc382d60c11f8567d890a60f49e5f94fb 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -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