more compilation fixes for VC6 (#9492)

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 04532e2b2b2aace3ed9af8a6600e2e4d56cfef33..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,15 +11,11 @@
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
-class wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
 {
 public:
     wxBitmapButton() { Init(); }
@@ -48,10 +44,8 @@ public:
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );
-    wxString GetLabel() const;
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
-    virtual void SetDefault();
     virtual bool Enable(bool enable = TRUE);
 
     // implementation
@@ -61,13 +55,14 @@ public:
     void NotFocus();
     void StartSelect();
     void EndSelect();
-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);
 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
 
     void Init();