Fixes so joystick not only compiles on Linux, but it actually works too!

[wxWidgets.git] / include / wx / univ / menuitem.h

diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index eff0730a0cb821ee9510349fbc0dba7f07853ad8..c0554556a064a3c551eb8f2ea198d061012609d0 100644 (file)
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_MENUITEM_H_
 #define _WX_UNIV_MENUITEM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univmenuitem.h"
 #endif
 
@@ -48,6 +48,11 @@ public:
     const wxBitmap& GetBitmap(bool checked = TRUE) const
       { return checked ? m_bmpChecked : m_bmpUnchecked; }
 
+    void SetDisabledBitmap( const wxBitmap& bmpDisabled )
+      { m_bmpDisabled = bmpDisabled; }
+    const wxBitmap& GetDisabledBitmap() const
+      { return m_bmpDisabled; }
+
     // mark item as belonging to the given radio group
     void SetAsRadioGroupStart();
     void SetRadioGroupStart(int start);
@@ -92,7 +97,8 @@ protected:
 
     // the bitmaps (may be invalid, then they're not used)
     wxBitmap m_bmpChecked,
-             m_bmpUnchecked;
+             m_bmpUnchecked,
+             m_bmpDisabled; 
 
     // the positions of the first and last items of the radio group this item
     // belongs to or -1: start is the radio group start and is valid for all