suppress virtual function hiding warnings due to the existence of several DoLog(...

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 92eda41c8c466f7b4a0ad722885ac115350ba2be..da79870b6c0881953bbfafee95c66b6f7bbabe5f 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/bmpbutton.h
+// Name:        wx/gtk1/bmpbutton.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,18 +11,15 @@
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
-class wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
 {
 public:
-    wxBitmapButton();
+    wxBitmapButton() { Init(); }
+
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
                    const wxBitmap& bitmap,
@@ -32,8 +29,11 @@ public:
                    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,
@@ -43,13 +43,11 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
-    virtual void SetDefault();
-    virtual bool Enable(bool enable = TRUE);
-
     void SetLabel( const wxString &label );
-    wxString GetLabel() const;
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
+    virtual bool Enable(bool enable = TRUE);
+
     // implementation
     // --------------
 
@@ -57,13 +55,16 @@ public:
     void NotFocus();
     void StartSelect();
     void EndSelect();
-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);
 
-    bool         m_hasFocus;
-    bool         m_isSelected;
+    bool         m_hasFocus:1;
+    bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
+
+    void Init();
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)