Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/cocoa/bmpbuttn.h b/include/wx/cocoa/bmpbuttn.h
index 1c52c5debe4030eccfc38476efdbb2326a65ba43..10a13948722cb94e8dd34a99e2e821d56697cc45 100644 (file)
--- a/include/wx/cocoa/bmpbuttn.h
+++ b/include/wx/cocoa/bmpbuttn.h
@@ -4,9 +4,8 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BMPBUTTN_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BMPBUTTN_H__


@@ -17,7 +16,7 @@
 // ========================================================================
 // wxBitmapButton
 // ========================================================================
 // ========================================================================
 // wxBitmapButton
 // ========================================================================

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

 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
     DECLARE_EVENT_TABLE()


@@ -54,6 +53,9 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // Implementation
 // ------------------------------------------------------------------------
 public:

+    // The wxButton::DoGetBestSize is not correct for bitmap buttons
+    wxSize DoGetBestSize() const
+    {   return wxButtonBase::DoGetBestSize(); }

 };
 
 #endif // __WX_COCOA_BMPBUTTN_H__
 };
 
 #endif // __WX_COCOA_BMPBUTTN_H__