X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..39de6d6ca1dd08e07d7a71581eaa22cd1ece836d:/include/wx/motif/menuitem.h diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h index c435b61208..7a6b76fb6f 100644 --- a/include/wx/motif/menuitem.h +++ b/include/wx/motif/menuitem.h @@ -12,7 +12,7 @@ #ifndef _WX_MOTIF_MENUITEM_H #define _WX_MOTIF_MENUITEM_H -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "menuitem.h" #endif @@ -24,7 +24,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 +38,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,8 +47,6 @@ 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 DestroyItem(bool full);