X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9874b4ee8308b8989c5df7db4f3559625299d0a4..726cc8697cd44a41b43257f05ca8cdd42b71a711:/include/wx/motif/menuitem.h diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index 75649d9f30..d2bdfd10c8 100644 --- a/include/wx/motif/menuitem.h +++ b/include/wx/motif/menuitem.h @@ -1,46 +1,51 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/motif/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin -// Modified by: +// 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 WXDLLIMPEXP_FWD_CORE wxMenuBar; // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItem: public wxMenuItemBase +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, - bool isCheckable = FALSE, - wxMenu *subMenu = (wxMenu *)NULL); - ~wxMenuItem(); + wxItemKind kind = wxITEM_NORMAL, + wxMenu *subMenu = NULL); + 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); - - void DeleteSubMenu(); + 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; } // 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; } @@ -55,6 +60,7 @@ private: WXWidget m_buttonWidget; wxMenuBar* m_menuBar; wxMenu* m_topMenu; // Top-level menu e.g. popup-menu + wxBitmap m_bitmap; // Bitmap for menuitem, if any DECLARE_DYNAMIC_CLASS(wxMenuItem) };