Added alpha blending in prep for FreeType text to canvas.

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

diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index a67c55846579664d9442eb2c4d7d1d76207e5d56..fa75e68fd5aff8980aa7deb3085125c9d8a84e53 100644 (file)
--- a/src/mac/statbmp.cpp
+++ b/src/mac/statbmp.cpp
@@ -23,16 +23,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
  * wxStaticBitmap
  */
 
  * wxStaticBitmap
  */
 

+BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
+    EVT_PAINT(wxStaticBitmap::OnPaint)
+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();


@@ -41,19 +49,35 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

-    // TODO: create static bitmap control
-    return FALSE;
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+       SetSizeOrDefault( size ) ;
+    
+    return ret;

 }
 
 void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
 }
 
 void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    // TODO
+    wxControl::SetSize( x , y , width , height , sizeFlags ) ;

 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;

+    SetSizeOrDefault();
+}
+void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
+{
+    wxPaintDC dc(this);
+    PrepareDC(dc);
+       dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
+       dc.DrawBitmap( m_messageBitmap , 0 , 0 ) ;
+}

 
 

-    // TODO: redraw bitmap
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+    if ( m_messageBitmap.Ok() )
+        return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
+    else
+        return wxSize(16, 16);  // completely arbitrary

 }
 
 }