image update

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index bcb31a9e908ce4255944a83adf008a96a19041b9..fd1df719c810f3cab601bcae6aa84b81a8ebf05f 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -19,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
+#include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -40,36 +41,54 @@ class wxBitmapButton: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 
-  public:
-
-    wxBitmapButton(void);
-    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)
-    {
+public:
+  wxBitmapButton();
+  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; }
+  }
+  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();
     
-  // implementation
-  
-    void ApplyWidgetStyle();    
+  void SetLabel( const wxString &label );
+  wxString GetLabel() const;
+  virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
     
-  public:
-  
-    wxBitmap   m_bitmap;    
+  wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_disabled; }
+  wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_focus; }
+  wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_bitmap; }
+  wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_selected; }
+    
+  void SetBitmapDisabled( const wxBitmap& bitmap );
+  void SetBitmapFocus( const wxBitmap& bitmap );
+  void SetBitmapLabel( const wxBitmap& bitmap );
+  void SetBitmapSelected( const wxBitmap& bitmap );
     
+  virtual void Enable(const bool);
+  
+// implementation
+
+  void HasFocus();
+  void NotFocus();
+  void StartSelect();
+  void EndSelect();
+  void SetBitmap();
+  void ApplyWidgetStyle();    
+  
+  bool         m_hasFocus;
+  bool         m_isSelected;
+  wxBitmap     m_bitmap; 
+  wxBitmap     m_disabled;
+  wxBitmap     m_focus;
+  wxBitmap     m_selected;   
 };
+
 #endif // __BMPBUTTONH__