Fixed wxWindowCreateEvent and wxWindowDestroyEvent to set m_eventType

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

diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index 721c2542348307ccd730a6533923bba23238b590..8bd5fecb71b2a5853109deb3c8512a27e11a8859 100644 (file)
--- a/src/mac/statbmp.cpp
+++ b/src/mac/statbmp.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/statbmp.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
 
 /*
  * wxStaticBitmap
@@ -34,9 +32,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-    m_messageBitmap = bitmap;
     SetName(name);
-    if (parent) parent->AddChild(this);
+
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;
+
+    m_messageBitmap = bitmap;
 
     if ( id == -1 )
            m_windowId = (int)NewControlId();
@@ -46,7 +47,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_windowStyle = style;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , name );
-
+    
+       SetSizeOrDefault() ;
+       
     return ret;
 }
 
@@ -58,14 +61,21 @@ 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.SetPalette( *m_messageBitmap.GetPalette() ) ;
+       dc.DrawBitmap( m_messageBitmap , 0 , 0 ) ;
+}
+
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+    if ( m_messageBitmap.Ok() )
+        return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
+    else
+        return wxSize(16, 16);  // completely arbitrary
 }