X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..05e3a383e0bff29b830f91b6b40e63a3b1a3e72f:/include/wx/gtk1/bmpbuttn.h

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 5d61d0708b..0454769f06 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -1,71 +1,78 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bmpbutton.h
+// Name:        wx/gtk/bmpbutton.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+// ----------------------------------------------------------------------------
+// wxBitmapButton
+// ----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+class wxBitmapButton: public wxBitmapButtonBase
+{
+public:
+    wxBitmapButton() { Init(); }
 
-class 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)
+    {
+        Init();
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+        Create(parent, id, bitmap, pos, size, style, validator, name);
+    }
 
-extern const char *wxButtonNameStr;
+    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);
 
-//-----------------------------------------------------------------------------
-// wxBitmapButton
-//-----------------------------------------------------------------------------
+    void SetLabel( const wxString &label );
+    wxString GetLabel() const;
+    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
-class wxBitmapButton: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    virtual void SetDefault();
+    virtual bool Enable(bool enable = TRUE);
 
-  public:
+    // implementation
+    // --------------
 
-    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)
-    {
-      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; }
-    
-  public:
-  
-    wxBitmap   m_bitmap;    
-    
+    void HasFocus();
+    void NotFocus();
+    void StartSelect();
+    void EndSelect();
+    void ApplyWidgetStyle();
+
+    bool         m_hasFocus:1;
+    bool         m_isSelected:1;
+
+protected:
+    virtual void OnSetBitmap();
+
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
+
 #endif // __BMPBUTTONH__