Toplevel windows now send both activate and focus

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 721c2542348307ccd730a6533923bba23238b590..47aa296e1c89f3e2c5025359eb31f858e8721780 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/statbmp.h"
 #endif
 
 #include "wx/statbmp.h"

+#include "wx/dcclient.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)


@@ -30,13 +31,17 @@ 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& size,
+           const wxSize& s,

            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-    m_messageBitmap = bitmap;

     SetName(name);
     SetName(name);

-    if (parent) parent->AddChild(this);
+       wxSize size = s ;
+
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;
+
+    m_messageBitmap = bitmap;

 
     if ( id == -1 )
            m_windowId = (int)NewControlId();
 
     if ( id == -1 )
            m_windowId = (int)NewControlId();


@@ -45,8 +50,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

-    bool ret = wxControl::Create( parent, id, pos, size, style , name );
-
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+       SetSizeOrDefault( size ) ;
+    

     return ret;
 }
 
     return ret;
 }
 


@@ -58,14 +64,21 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;

-
-    Refresh() ;
+    SetSizeOrDefault();

 }
 void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
 }
 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

 }
 
 }