X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..5851053a968330aea0a4bd6918b330eb0bfa0007:/include/wx/motif/menuitem.h diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index 762ccdd7ce..c4fc2b41b4 100644 --- a/include/wx/motif/menuitem.h +++ b/include/wx/motif/menuitem.h @@ -12,10 +12,6 @@ #ifndef _WX_MOTIF_MENUITEM_H #define _WX_MOTIF_MENUITEM_H -#if defined(__GNUG__) && !defined(__APPLE__) -#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 @@ -38,8 +34,8 @@ public: // 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 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. @@ -47,10 +43,9 @@ public: 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; }