X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37d403aa1cf182cfc01e2ce1753c2dda39ba82ea..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/menuitem.h diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h index 2a10795fb9..3158958722 100644 --- a/include/wx/gtk1/menuitem.h +++ b/include/wx/gtk1/menuitem.h @@ -4,13 +4,13 @@ // 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(__APPLE__) #pragma interface #endif @@ -27,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(); @@ -52,7 +52,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 = (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);