No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index c8dbaba78d4a0b0e331f0876b519f435a92fc220..40dc99d9bb787674de9272941f58cdc56d564cb1 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -1,34 +1,72 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbutton.h
+// Name:        wx/gtk1/bmpbutton.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
+// ----------------------------------------------------------------------------
+// wxBitmapButton
+// ----------------------------------------------------------------------------

 
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
+{
+public:
+    wxBitmapButton() { Init(); }

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+    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)
+    {
+        Init();

 
 

-class wxBitmapButton;
+        Create(parent, id, bitmap, pos, size, style, validator, name);
+    }

 
 

-//-----------------------------------------------------------------------------
-// wxBitmapButton
-//-----------------------------------------------------------------------------
+    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 SetLabel( const wxString &label );
+    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
+
+    virtual bool Enable(bool enable = TRUE);
+
+    // implementation
+    // --------------
+
+    void GTKSetHasFocus();
+    void GTKSetNotFocus();
+    void StartSelect();
+    void EndSelect();
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    bool         m_hasFocus:1;
+    bool         m_isSelected:1;
+
+protected:
+    virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
+
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+};

 
 #endif // __BMPBUTTONH__
 
 #endif // __BMPBUTTONH__