X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..14b44999eb335f3fc84b4362980b1730b8887588:/include/wx/gtk/menuitem.h?ds=sidebyside diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index 790aa61847..78d967612a 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -7,12 +7,8 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifndef __GTKMENUITEMH__ -#define __GTKMENUITEMH__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif +#ifndef _WX_GTKMENUITEM_H_ +#define _WX_GTKMENUITEM_H_ #include "wx/bitmap.h" @@ -20,63 +16,48 @@ // 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 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; - 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; } - GtkWidget *GetLabelWidget() const { return m_labelWidget; } - void SetLabelWidget(GtkWidget *labelWidget) { m_labelWidget = labelWidget; } - 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 = (wxMenu *)NULL); + wxMenu *subMenu = NULL) + ); +#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 - GtkWidget* m_labelWidget; // Label widget DECLARE_DYNAMIC_CLASS(wxMenuItem) }; - -#endif - //__GTKMENUITEMH__ +#endif // _WX_GTKMENUITEM_H_