X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/546bfbea8180aeee5a16f4abb34e721445277305..235a997f9aea9d80774e296d314682e99e0c46f1:/include/wx/gtk1/menuitem.h?ds=sidebyside diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h index 54ea397bd1..48b3778e36 100644 --- a/include/wx/gtk1/menuitem.h +++ b/include/wx/gtk1/menuitem.h @@ -1,38 +1,35 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/gtk1/menuitem.h // Purpose: wxMenuItem class // Author: Robert Roebling // RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef __GTKMENUITEMH__ #define __GTKMENUITEMH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/bitmap.h" //----------------------------------------------------------------------------- // wxMenuItem //----------------------------------------------------------------------------- -class wxMenuItem : public wxMenuItemBase +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); - ~wxMenuItem(); + wxMenu *subMenu = NULL); + 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,7 +49,18 @@ public: wxString GetHotKey() const { return m_hotKey; } + // compatibility only, don't use in new code + wxMenuItem(wxMenu *parentMenu, + int id, + const wxString& text, + const wxString& help, + bool isCheckable, + wxMenu *subMenu = NULL); + private: + // common part of all ctors + void Init(); + // 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); @@ -66,6 +74,5 @@ private: DECLARE_DYNAMIC_CLASS(wxMenuItem) }; - #endif //__GTKMENUITEMH__