Added missing constant

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 4a029af1b9dee9862218b107358235ffb770b347..7126dc067527dc8fcc1ad3c9eb1f0c1bba64ebfd 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -16,10 +16,14 @@
 #endif
 
 #include "wx/defs.h"
 #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/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/bitmap.h"

+#include "wx/button.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -31,13 +35,13 @@ class wxBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;

 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 

-class wxBitmapButton: public wxControl
+class wxBitmapButton: public wxButton

 {
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 
 {
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 


@@ -56,7 +60,7 @@ public:
                const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxButtonNameStr);
                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;
     
   void SetLabel( const wxString &label );
   wxString GetLabel() const;


@@ -72,7 +76,7 @@ public:
   void SetBitmapLabel( const wxBitmap& bitmap );
   void SetBitmapSelected( const wxBitmap& bitmap );
     
   void SetBitmapLabel( const wxBitmap& bitmap );
   void SetBitmapSelected( const wxBitmap& bitmap );
     

-  virtual bool Enable(const bool);
+  virtual bool Enable(bool enable);

   
 // implementation
 
   
 // implementation
 


@@ -91,4 +95,6 @@ public:
   wxBitmap     m_selected;   
 };
 
   wxBitmap     m_selected;   
 };
 

+#endif
+

 #endif // __BMPBUTTONH__
 #endif // __BMPBUTTONH__