added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index 721c2542348307ccd730a6533923bba23238b590..35e918d469812fd4e6d9c2b952c7e7e19fd2234d 100644 (file)
--- a/src/mac/statbmp.cpp
+++ b/src/mac/statbmp.cpp
@@ -10,10 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "statbmp.h"
+  #pragma implementation "statbmp.h"

 #endif
 
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/statbmp.h"
 #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)


@@ -23,21 +26,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
  * wxStaticBitmap
  */
 
  * wxStaticBitmap
  */
 

-BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
+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,
     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)
 {
            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_bitmap = bitmap;

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


@@ -45,8 +51,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 );
+       SetBestSize( size ) ;
+    

     return ret;
 }
 
     return ret;
 }
 


@@ -57,15 +64,24 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {

-    m_messageBitmap = bitmap;
-
+    m_bitmap = bitmap;

     Refresh() ;
     Refresh() ;

+    SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));

 }
 }

+

 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.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

 }
 
 }