X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..14cd0443d97862d6dacac3c05ddf77cdef3f3d4e:/src/mac/carbon/statbmp.cpp

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index f55267cb87..8948b0c3e5 100644
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,27 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/mac/carbon/statbmp.cpp
 // Purpose:     wxStaticBitmap
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-  #pragma implementation "statbmp.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/defs.h"
+#if wxUSE_STATBMP
 
 #include "wx/statbmp.h"
-#include "wx/dcclient.h"
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
 #endif
 
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+
 /*
  * wxStaticBitmap
  */
@@ -43,7 +42,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_bitmap = bitmap;
-    if ( id == -1 )
+    if ( id == wxID_ANY )
           m_windowId = (int)NewControlId();
     else
         m_windowId = id;
@@ -51,28 +50,37 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_windowStyle = style;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-    SetBestSize( size ) ;
-    
+    SetInitialSize( size ) ;
+
     return ret;
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;
+    InvalidateBestSize();
     SetSize(GetBestSize());
     Refresh() ;
 }
 
-void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) 
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
 
-    dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+    if (m_bitmap.Ok())
+    {
+        dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+    }
 }
 
 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) );
 }
 
+#endif