X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b59cdbfaf7df79499424c92ff6177736429ff8a..14b44999eb335f3fc84b4362980b1730b8887588:/include/wx/gtk/menuitem.h?ds=sidebyside diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index 54d91d04f1..78d967612a 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -4,60 +4,60 @@ // Author: Robert Roebling // RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifndef __GTKMENUITEMH__ -#define __GTKMENUITEMH__ +#ifndef _WX_GTKMENUITEM_H_ +#define _WX_GTKMENUITEM_H_ -#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, - bool isCheckable = FALSE, - wxMenu *subMenu = (wxMenu *)NULL); - ~wxMenuItem(); + wxItemKind kind = wxITEM_NORMAL, + wxMenu *subMenu = NULL); + virtual ~wxMenuItem(); // implement base class virtuals - virtual void SetText( const wxString& str ); - virtual void Enable( bool enable = TRUE ); - virtual void Check( bool check = TRUE ); + virtual void SetItemLabel( const wxString& str ); + virtual void Enable( bool enable = true ); + virtual void Check( bool check = true ); virtual bool IsChecked() const; - -#if wxUSE_ACCEL - virtual wxAcceleratorEntry *GetAccel() const; -#endif // wxUSE_ACCEL + virtual void SetBitmap(const wxBitmap& bitmap); + virtual const wxBitmap& GetBitmap() const { return m_bitmap; } // implementation void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; } GtkWidget *GetMenuItem() const { return m_menuItem; } - wxString GetFactoryPath() const; - - wxString GetHotKey() const { return m_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, + const wxString& help, + bool isCheckable, + wxMenu *subMenu = NULL) + ); +#endif private: - // 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) }; - -#endif - //__GTKMENUITEMH__ +#endif // _WX_GTKMENUITEM_H_