added network-to-host noops

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 721c2542348307ccd730a6533923bba23238b590..f8fb079fd450d273395aa4c5765e33a516854ba3 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,19 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.cpp
 // Purpose:     wxStaticBitmap
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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,7 +26,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
  * wxStaticBitmap
  */
 
-BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
+BEGIN_EVENT_TABLE(wxStaticBitmap, wxStaticBitmapBase)
     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()
 
@@ -34,38 +37,42 @@ 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_bitmap = bitmap;
     if ( id == -1 )
-           m_windowId = (int)NewControlId();
+          m_windowId = (int)NewControlId();
     else
-           m_windowId = id;
+        m_windowId = id;
 
     m_windowStyle = style;
 
-    bool ret = wxControl::Create( parent, id, pos, size, style , name );
-
+    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)
-{
-    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
-}
-
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
-    m_messageBitmap = bitmap;
-
+    m_bitmap = bitmap;
+    SetSize(GetBestSize());
     Refresh() ;
 }
-void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
+
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) 
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
-               dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
-               dc.DrawBitmap( m_messageBitmap , 0 , 0 ) ;
+
+    dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+}
+
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+    return DoGetSizeFromClientSize( wxSize( m_bitmap.GetWidth() , m_bitmap.GetHeight() ) ) ;
 }