changed menu creation for choice and combobox (unique ids), control changed back...

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index a67c55846579664d9442eb2c4d7d1d76207e5d56..35e918d469812fd4e6d9c2b952c7e7e19fd2234d 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/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,24 @@ 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 ;
+
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;
 
+    m_bitmap = bitmap;
     if ( id == -1 )
            m_windowId = (int)NewControlId();
     else
@@ -41,19 +51,37 @@ 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)
 {
-    // TODO
+    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
-    m_messageBitmap = bitmap;
+    m_bitmap = bitmap;
+    Refresh() ;
+    SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
+}
 
-    // TODO: redraw bitmap
+void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
+{
+    wxPaintDC dc(this);
+    PrepareDC(dc);
+
+    dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+}
+
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+   if ( m_bitmap.Ok() )
+       return wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight());
+   else
+       return wxSize(16, 16);  // completely arbitrary
 }