USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 57bc2c387327dcf375911e10aa652a48f1a2b189..6800d97bf4a8068b4f27ba1a4e9ec3bf9accaf53 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -44,15 +44,25 @@ class wxBitmapButton: public wxControl
   public:
 
     wxBitmapButton(void);
-    wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxButtonNameStr  );
-    bool Create(  wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxButtonNameStr  );
+    inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr)
+    {
+      Create(parent, id, bitmap, pos, size, style, validator, name);
+    }
+    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr);
     void SetDefault(void);
     void SetLabel( const wxString &label );
     wxString GetLabel(void) const;
+    virtual void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); }
+    virtual void SetBitmapLabel( const wxBitmap& bitmap );
+    wxBitmap& GetBitmapLabel(void) const { return (wxBitmap&) m_bitmap; }
     
   public: