set eol-style

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 04532e2b2b2aace3ed9af8a6600e2e4d56cfef33..68fe9bb8a4a4f0f586945618892b9379dac0f921 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -11,15 +11,11 @@
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 

-class wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase

 {
 public:
     wxBitmapButton() { Init(); }
 {
 public:
     wxBitmapButton() { Init(); }


@@ -48,10 +44,8 @@ public:
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );

-    wxString GetLabel() const;

     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 

-    virtual void SetDefault();

     virtual bool Enable(bool enable = TRUE);
 
     // implementation
     virtual bool Enable(bool enable = TRUE);
 
     // implementation


@@ -61,13 +55,14 @@ public:
     void NotFocus();
     void StartSelect();
     void EndSelect();
     void NotFocus();
     void StartSelect();
     void EndSelect();

-    void ApplyWidgetStyle();

 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();
 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();

+    virtual wxSize DoGetBestSize() const;
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
     void Init();
 
 
     void Init();