removed useless ; to allow smart preprocessing under Mac OS X

[wxWidgets.git] / src / mac / carbon / statbmp.cpp

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index fa75e68fd5aff8980aa7deb3085125c9d8a84e53..007070cb89fd1866d5df97ef69a20837c08334bc 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -13,7 +13,10 @@
 #pragma implementation "statbmp.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/statbmp.h"
+#include "wx/dcclient.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
@@ -41,7 +44,6 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_messageBitmap = bitmap;
-
     if ( id == -1 )
            m_windowId = (int)NewControlId();
     else
@@ -63,21 +65,23 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;
+    Refresh() ;
     SetSizeOrDefault();
 }
+
 void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
-       dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
-       dc.DrawBitmap( m_messageBitmap , 0 , 0 ) ;
+
+    dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;
 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
-    if ( m_messageBitmap.Ok() )
-        return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
-    else
-        return wxSize(16, 16);  // completely arbitrary
+   if ( m_messageBitmap.Ok() )
+       return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
+   else
+       return wxSize(16, 16);  // completely arbitrary
 }