wxRadioBox fixed on mac

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index ce1e5d1ec871626e1548e19a3b8ded38da41bc91..f85c66b456a8bdacc902160530fc756536a62f75 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -14,8 +14,11 @@
 #endif
 
 #include "wx/statbmp.h"
+#include "wx/dcclient.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#endif
 
 /*
  * wxStaticBitmap
@@ -28,11 +31,12 @@ END_EVENT_TABLE()
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,
-           const wxSize& size,
+           const wxSize& s,
            long style,
            const wxString& name)
 {
     SetName(name);
+       wxSize size = s ;
 
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
@@ -47,9 +51,8 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_windowStyle = style;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+       SetSizeOrDefault( size ) ;
     
-       SetSizeOrDefault() ;
-       
     return ret;
 }
 
@@ -68,7 +71,7 @@ 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