X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/motif/menuitem.h?ds=sidebyside diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index 9ef377a38c..d2bdfd10c8 100644 --- a/include/wx/motif/menuitem.h +++ b/include/wx/motif/menuitem.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.h +// Name: wx/motif/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin // Modified by: @@ -12,61 +12,56 @@ #ifndef _WX_MOTIF_MENUITEM_H #define _WX_MOTIF_MENUITEM_H -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#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 - 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); - ~wxMenuItem(); - + 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); + 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; } - + wxMenuBar* GetMenuBar() const { return m_menuBar; } void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; } - + wxMenu* GetTopMenu() const { return m_topMenu; } void SetTopMenu(wxMenu* menu) { m_topMenu = menu; } - + 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) };