Add wxCocoa to the list of ports which don't need wxColour to derive from wxGDIObject.

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 0454769f062bceb6750c0cee6a7a6f943ab769d2..19eb664d1c7cff06b00267b423be9ca31c0d12c2 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -11,15 +11,11 @@
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
-class wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
 {
 public:
     wxBitmapButton() { Init(); }
@@ -48,26 +44,25 @@ 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
     // --------------
 
-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
-    void ApplyWidgetStyle();
+    void GTKHasFocus();
+    void GTKNotFocus();
+    void GTKStartSelect();
+    void GTKEndSelect();
 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
 
     void Init();