X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/354aa1e366a57d896e2cf0943c687b24e8db688c..c3627a004d0333ec7bfc88e2a397d7d7f9752ea9:/include/wx/gtk1/menuitem.h diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h index 58b65fc25d..790aa61847 100644 --- a/include/wx/gtk1/menuitem.h +++ b/include/wx/gtk1/menuitem.h @@ -4,16 +4,18 @@ // Author: Robert Roebling // RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef __GTKMENUITEMH__ #define __GTKMENUITEMH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif +#include "wx/bitmap.h" + //----------------------------------------------------------------------------- // wxMenuItem //----------------------------------------------------------------------------- @@ -25,7 +27,7 @@ public: int id = wxID_SEPARATOR, const wxString& text = wxEmptyString, const wxString& help = wxEmptyString, - bool isCheckable = FALSE, + wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); ~wxMenuItem(); @@ -34,22 +36,43 @@ public: 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 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; } + GtkWidget *GetLabelWidget() const { return m_labelWidget; } + void SetLabelWidget(GtkWidget *labelWidget) { m_labelWidget = labelWidget; } wxString GetFactoryPath() const; 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 = (wxMenu *)NULL); + 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 + GtkWidget* m_labelWidget; // Label widget DECLARE_DYNAMIC_CLASS(wxMenuItem) };