removed tabs; minor cosmetic cleanup

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index dfcf70ce732b326e135f83cc42aac2e9f768cfe2..c71501e59a7c8e57e57f2f044336f6d716058541 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -1,101 +1,79 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbutton.h
+// Name:        wx/gtk/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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #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"
-#include "wx/button.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxBitmapButton;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar *wxButtonNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxBitmapButton
 // wxBitmapButton

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

 
 

-class wxBitmapButton: public wxButton
+class wxBitmapButton: public wxBitmapButtonBase

 {
 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 )
+    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);
     }
         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();
-    
+
+    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 );
     wxString GetLabel() const;
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
     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
+
+    virtual void SetDefault();
+    virtual bool Enable(bool enable = TRUE);
+
+    // implementation
+    // --------------

 
     void HasFocus();
     void NotFocus();
     void StartSelect();
     void EndSelect();
 
     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;   
-  
+    void ApplyWidgetStyle();
+
+    bool         m_hasFocus:1;
+    bool         m_isSelected:1;
+
+protected:
+    virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
+
+    void Init();
+

 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
 

-#endif
-

 #endif // __BMPBUTTONH__
 #endif // __BMPBUTTONH__