added more files (unchanged) from wxUniv branch

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 57bc2c387327dcf375911e10aa652a48f1a2b189..baae20d297ed112c558b5ebbdff79d17a4e00763 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,47 +15,59 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxBitmapButton;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxButtonNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxBitmapButton
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxBitmapButton: public wxControl
+class wxBitmapButton: public wxBitmapButtonBase
 {
-  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-
-  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  );
-    void SetDefault(void);
+public:
+    wxBitmapButton();
+    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);
+
+    virtual void SetDefault();
+    virtual bool Enable(bool enable = TRUE);
+    
     void SetLabel( const wxString &label );
-    wxString GetLabel(void) const;
+    wxString GetLabel() const;
+    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
     
-  public:
+    // implementation
+    // --------------
   
-    wxBitmap   m_bitmap;    
-    
+    void HasFocus();
+    void NotFocus();
+    void StartSelect();
+    void EndSelect();
+    void SetBitmap();
+    void ApplyWidgetStyle();    
+  
+    bool         m_hasFocus;
+    bool         m_isSelected;
+  
+protected:
+    virtual void OnSetBitmap();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
+
 #endif // __BMPBUTTONH__