X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..0685aa9eb65aae0c930ef2a001002ac217cf5ce1:/include/wx/gtk/menuitem.h diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index f3a935735c..4133cc5e83 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -10,10 +10,6 @@ #ifndef __GTKMENUITEMH__ #define __GTKMENUITEMH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/bitmap.h" //----------------------------------------------------------------------------- @@ -29,10 +25,11 @@ public: const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); - ~wxMenuItem(); + virtual ~wxMenuItem(); // implement base class virtuals - virtual void SetText( const wxString& str ); + 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; @@ -52,6 +49,10 @@ public: wxString GetHotKey() const { return m_hotKey; } + // splits given string in the label, doing & => _ translation, which is returned, + // and in the hotkey which is used to set given pointer + static wxString GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey); + // compatibility only, don't use in new code wxMenuItem(wxMenu *parentMenu, int id, @@ -77,6 +78,5 @@ private: DECLARE_DYNAMIC_CLASS(wxMenuItem) }; - #endif //__GTKMENUITEMH__