another GetInt/GetId bug fix

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 41ef3b50774f35dc2539b426e8e739ee1cb52c2d..233e8d90e858a07f0fc5594c9ecea7021d5c722e 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -2,9 +2,8 @@
 // Name:        bmpbutton.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,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
@@ -31,39 +35,76 @@ 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)
-
-  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);
+        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);
+    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);
+    virtual void SetDefault();
+    
     void SetLabel( const wxString &label );
-    wxString GetLabel(void) const;
+    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 );
+    
+    void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
+    int GetMarginX() const { return m_marginX; }
+    int GetMarginY() const { return m_marginY; }
+
+    virtual bool Enable(bool enable);
+  
+    // 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;   
+  
+protected:
+    int      m_marginX;
+    int      m_marginY;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
+
+#endif
+
 #endif // __BMPBUTTONH__