adjusting DoGetBestSize according MSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 69b6f8b448c28a098485690e60044baa2372c065..abe7a951b298e963401b826c91ee403c40bf807b 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -74,6 +74,10 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
-    return DoGetSizeFromClientSize( wxSize( m_bitmap.GetWidth() , m_bitmap.GetHeight() ) ) ;
+    if ( m_bitmap.Ok() )
+        return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) );
+
+    // this is completely arbitrary
+    return DoGetSizeFromClientSize( wxSize(16, 16) ); 
 }