Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/bmpbuttn.h b/include/wx/cocoa/bmpbuttn.h
index d2d003c133cb36a4b5de4f714f390f5e9f19b7bb..e9c22e908a96e577352d4c71eee8b4850f5094ba 100644 (file)
--- a/include/wx/cocoa/bmpbuttn.h
+++ b/include/wx/cocoa/bmpbuttn.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BMPBUTTN_H__
@@ -17,7 +17,7 @@
 // ========================================================================
 // wxBitmapButton
 // ========================================================================
-class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
     DECLARE_EVENT_TABLE()
@@ -54,6 +54,9 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
+    // The wxButton::DoGetBestSize is not correct for bitmap buttons
+    wxSize DoGetBestSize() const
+    {   return wxButtonBase::DoGetBestSize(); }
 };
 
 #endif // __WX_COCOA_BMPBUTTN_H__