best size calculations based on bitmap size

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 68bc4efa6ac16f137f7604be33f235dfddf12ae3..f8fb079fd450d273395aa4c5765e33a516854ba3 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -33,19 +33,11 @@ END_EVENT_TABLE()
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,

-           const wxSize& s,
+           const wxSize& size,

            long style,
            const wxString& name)
 {
     SetName(name);
            long style,
            const wxString& name)
 {
     SetName(name);

-    wxSize size = s ;
-    if ( bitmap.Ok() )
-    {
-        if ( size.x == -1 )
-            size.x = bitmap.GetWidth() ;
-        if ( size.y == -1 )
-            size.y = bitmap.GetHeight() ;
-    }

 
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;


@@ -67,7 +59,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;

-    SetSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
+    SetSize(GetBestSize());

     Refresh() ;
 }
 
     Refresh() ;
 }
 


@@ -81,6 +73,6 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {

-    return wxWindow::DoGetBestSize() ;
+    return DoGetSizeFromClientSize( wxSize( m_bitmap.GetWidth() , m_bitmap.GetHeight() ) ) ;

 }
 
 }