Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

[wxWidgets.git] / include / wx / motif / bmpbuttn.h

diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index 8ce933170d1d44a83f033e806494f54988888a11..af3237a0dfad6cfb9456fc73aa287df510930d32 100644 (file)
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -12,11 +12,11 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "bmpbuttn.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+#include "wx/motif/bmpmotif.h"
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
@@ -67,7 +67,9 @@ protected:
     // to reflect button background colour
     wxBitmap m_bmpSelectedOriginal;   
     wxBitmap m_bmpDisabledOriginal;
-    
+
+    wxBitmapCache m_bitmapCache;
+
     WXPixmap m_insensPixmap;
 };