X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..29b30405aaef61ac091dc26df946ad90d0bc4f1b:/src/mac/statbmp.cpp?ds=sidebyside

diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index a67c558465..d04e549b0e 100644
--- a/src/mac/statbmp.cpp
+++ b/src/mac/statbmp.cpp
@@ -10,10 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "statbmp.h"
+  #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)
@@ -23,17 +26,31 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
  * wxStaticBitmap
  */
 
+BEGIN_EVENT_TABLE(wxStaticBitmap, wxStaticBitmapBase)
+    EVT_PAINT(wxStaticBitmap::OnPaint)
+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)
 {
-    m_messageBitmap = bitmap;
     SetName(name);
-    if (parent) parent->AddChild(this);
+	wxSize size = s ;
+	if ( bitmap.Ok() )
+	{
+    	if ( size.x == -1 )
+    	    size.x = bitmap.GetWidth() ;
+    	if ( size.y == -1 )
+    	    size.y = bitmap.GetHeight() ;
+    }
 
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;
+
+    m_bitmap = bitmap;
     if ( id == -1 )
   	    m_windowId = (int)NewControlId();
     else
@@ -41,19 +58,29 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
-    // TODO: create static bitmap control
-    return FALSE;
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+	SetBestSize( size ) ;
+    
+    return ret;
 }
 
-void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
-    // TODO
+    m_bitmap = bitmap;
+    SetSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
+    Refresh() ;
 }
 
-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
 {
-    m_messageBitmap = bitmap;
+    wxPaintDC dc(this);
+    PrepareDC(dc);
+
+    dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+}
 
-    // TODO: redraw bitmap
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+    return wxWindow::DoGetBestSize() ;
 }