set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 3b9da9a1899653bf08dc25f777991d882fc14194..3af18cfeec2417fb912c22eb3fe8b2a2b54be5e8 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -4,22 +4,18 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
-class wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
 {
 public:
     wxBitmapButton() { Init(); }
@@ -48,7 +44,6 @@ public:
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );
-    wxString GetLabel() const;
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
     virtual void SetDefault();
@@ -61,7 +56,6 @@ public:
     void NotFocus();
     void StartSelect();
     void EndSelect();
-    void ApplyWidgetStyle();
 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
@@ -69,6 +63,7 @@ public:
 protected:
     virtual void OnSetBitmap();
     virtual wxSize DoGetBestSize() const;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
 
     void Init();