converted to 16 colors

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 827f5f4d32183e80450bd621a0d686d318a9a64a..4d3a769c400a3cc2da901dafa068144c782886f3 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -16,9 +16,13 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_BMPBUTTON
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
+#include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -30,7 +34,7 @@ class wxBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
@@ -71,7 +75,7 @@ public:
   void SetBitmapLabel( const wxBitmap& bitmap );
   void SetBitmapSelected( const wxBitmap& bitmap );
     
-  virtual void Enable(const bool);
+  virtual bool Enable(bool enable);
   
 // implementation
 
@@ -90,4 +94,6 @@ public:
   wxBitmap     m_selected;   
 };
 
+#endif
+
 #endif // __BMPBUTTONH__