X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1deef99727c57b21976be81a14312f001fededb4..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk/menuitem.h?ds=sidebyside diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index c538d03819..c17ad03a97 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -1,8 +1,7 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/gtk/menuitem.h // Purpose: wxMenuItem class // Author: Robert Roebling -// RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -19,12 +18,12 @@ 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 @@ -36,13 +35,13 @@ public: virtual const wxBitmap& GetBitmap() const { return m_bitmap; } // implementation - void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; } + void SetMenuItem(GtkWidget *menuItem); GtkWidget *GetMenuItem() const { return m_menuItem; } void SetGtkLabel(); #if WXWIN_COMPATIBILITY_2_8 // compatibility only, don't use in new code - wxDEPRECATED( + wxDEPRECATED_CONSTRUCTOR( wxMenuItem(wxMenu *parentMenu, int id, const wxString& text,