Fix a number of mingw compile errors.

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index f4d71460df7ae126d2d614ae116f73ebcb7e62fc..726d4babcb7a1af074a5a84649d96d8d2a51cceb 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,15 +11,11 @@
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

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

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

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


@@ -48,17 +44,15 @@ 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
     // --------------
 

-    void HasFocus();
-    void NotFocus();
+    void GTKSetHasFocus();
+    void GTKSetNotFocus();

     void StartSelect();
     void EndSelect();
     void DoApplyWidgetStyle(GtkRcStyle *style);
     void StartSelect();
     void EndSelect();
     void DoApplyWidgetStyle(GtkRcStyle *style);