X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/motif/menuitem.h diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index e9c6bc965d..d2bdfd10c8 100644 --- a/include/wx/motif/menuitem.h +++ b/include/wx/motif/menuitem.h @@ -14,7 +14,7 @@ #include "wx/bitmap.h" -class WXDLLEXPORT wxMenuBar; +class WXDLLIMPEXP_FWD_CORE wxMenuBar; // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour @@ -24,16 +24,16 @@ class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: // ctor & dtor - 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(); // accessors (some more are inherited from wxOwnerDrawn or are below) - virtual void SetText(const wxString& label); + virtual void SetItemLabel(const wxString& label); virtual void Enable(bool enable = true); virtual void Check(bool check = true); // included SetBitmap and GetBitmap as copied from the GTK include file