remove check for missing gtk_icon_size_lookup, since it is for GTK+ 2.1, and 2.4...

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 7806bc1471e9cf97efe77aba8049ad08658189d2..da79870b6c0881953bbfafee95c66b6f7bbabe5f 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -1,99 +1,73 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_BMPBUTTON
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxBitmapButton;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxButtonNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxBitmapButton
 // wxBitmapButton

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxBitmapButton: public wxControl
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-

 public:
 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 SetLabel( const wxString &label );
-  wxString GetLabel() const;
-  virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(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 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;   
+    wxBitmapButton() { Init(); }
+
+    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();
+
+        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 SetLabel( const wxString &label );
+    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
+
+    virtual bool Enable(bool enable = TRUE);
+
+    // implementation
+    // --------------
+
+    void HasFocus();
+    void NotFocus();
+    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
-

 #endif // __BMPBUTTONH__
 #endif // __BMPBUTTONH__