X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fdff4a5b43d531224a6dce5b9b0d56379dbfe75..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/motif/menuitem.h diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index dc69814736..e8b114573a 100644 --- a/include/wx/motif/menuitem.h +++ b/include/wx/motif/menuitem.h @@ -1,30 +1,26 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/motif/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin // Modified by: // Created: 11.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_MOTIF_MENUITEM_H #define _WX_MOTIF_MENUITEM_H -#ifdef __GNUG__ - #pragma interface "menuitem.h" -#endif - #include "wx/bitmap.h" -class WXDLLEXPORT wxMenuBar; +class WXDLLIMPEXP_FWD_CORE wxMenuBar; // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- -class wxMenuItem : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: // ctor & dtor @@ -32,25 +28,24 @@ 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(); + virtual ~wxMenuItem(); // accessors (some more are inherited from wxOwnerDrawn or are below) - virtual void SetText(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 - // I'm not sure if this works but it silences the linker in the - // menu sample. - // JJ + 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 + // I'm not sure if this works but it silences the linker in the + // menu sample. + // JJ virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } virtual const wxBitmap& GetBitmap() const { return m_bitmap; } - void DeleteSubMenu(); - // implementation from now on - void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu); + void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu, + size_t index); void DestroyItem(bool full); WXWidget GetButtonWidget() const { return m_buttonWidget; }