X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aac7dbf3aa68d419365cfeb1dcbacc467271e67c..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/gtk/menuitem.h diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index dbc24b2d88..7f509584b0 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/gtk/menuitem.h // Purpose: wxMenuItem class // Author: Robert Roebling // RCS-ID: $Id$ @@ -19,38 +19,31 @@ class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: - wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL, + wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& text = wxEmptyString, const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = (wxMenu *)NULL); + wxMenu *subMenu = NULL); virtual ~wxMenuItem(); // 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; - virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } + virtual void SetBitmap(const wxBitmap& bitmap); virtual const wxBitmap& GetBitmap() const { return m_bitmap; } -#if wxUSE_ACCEL - virtual wxAcceleratorEntry *GetAccel() const; -#endif // wxUSE_ACCEL - // implementation void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; } GtkWidget *GetMenuItem() const { return m_menuItem; } - - // 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); + void SetGtkLabel(); #if WXWIN_COMPATIBILITY_2_8 // compatibility only, don't use in new code wxDEPRECATED( + inline wxMenuItem(wxMenu *parentMenu, int id, const wxString& text, @@ -61,16 +54,7 @@ public: #endif private: - // common part of all ctors - void Init(const wxString& text); - - // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin - // style to GTK+ and is called from ctor and SetText() - void DoSetText(const wxString& text); - - wxString m_hotKey; wxBitmap m_bitmap; // Bitmap for menuitem, if any - GtkWidget *m_menuItem; // GtkMenuItem DECLARE_DYNAMIC_CLASS(wxMenuItem)