no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 41ef3b50774f35dc2539b426e8e739ee1cb52c2d..726d4babcb7a1af074a5a84649d96d8d2a51cceb 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -1,69 +1,73 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
+// Id:          $Id$
+// 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);
+    }

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    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);

 
 

-extern const char *wxButtonNameStr;
+    void SetLabel( const wxString &label );
+    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }

 
 

-//-----------------------------------------------------------------------------
-// wxBitmapButton
-//-----------------------------------------------------------------------------
+    virtual bool Enable(bool enable = TRUE);

 
 

-class wxBitmapButton: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    // implementation
+    // --------------

 
 

-  public:
+    void GTKSetHasFocus();
+    void GTKSetNotFocus();
+    void StartSelect();
+    void EndSelect();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
 

-    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;
-    
-  public:
-  
-    wxBitmap   m_bitmap;    
-    
+    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__