Added defines to allow altered tab placement under gcc-2.95

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 827f5f4d32183e80450bd621a0d686d318a9a64a..7126dc067527dc8fcc1ad3c9eb1f0c1bba64ebfd 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -16,9 +16,14 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_BMPBUTTON
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
+#include "wx/bitmap.h"
+#include "wx/button.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -30,13 +35,13 @@ class wxBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
-class wxBitmapButton: public wxControl
+class wxBitmapButton: public wxButton
 {
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 
@@ -55,7 +60,7 @@ public:
                const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxButtonNameStr);
-  void SetDefault();
+  virtual void SetDefault();
     
   void SetLabel( const wxString &label );
   wxString GetLabel() const;
@@ -71,7 +76,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 +95,6 @@ public:
   wxBitmap     m_selected;   
 };
 
+#endif
+
 #endif // __BMPBUTTONH__