X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96be256b3e1802de10f45953c41ed33bce399b54..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/motif/menuitem.h diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index 927eea72c6..e9c6bc965d 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,10 +12,6 @@ #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; @@ -24,7 +20,7 @@ class WXDLLEXPORT 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 @@ -34,8 +30,8 @@ public: const wxString& help = wxEmptyString, 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); @@ -46,25 +42,26 @@ public: // 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; } - + 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) };