Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 522d2ed2302ee306d0859a81644799b0f415984c..e7ce2f1633631d9903085bbfcd66d89d09a144fb 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,26 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.cpp
 // Purpose:     wxStaticBitmap
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.cpp
 // Purpose:     wxStaticBitmap

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-  #pragma implementation "statbmp.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/defs.h"
+#if wxUSE_STATBMP

 
 #include "wx/statbmp.h"
 #include "wx/dcclient.h"
 
 
 #include "wx/statbmp.h"
 #include "wx/dcclient.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)

-#endif

 
 /*
  * wxStaticBitmap
 
 /*
  * wxStaticBitmap


@@ -33,33 +29,25 @@ 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& s,
+           const wxSize& size,

            long style,
            const wxString& name)
 {
     SetName(name);
            long style,
            const wxString& name)
 {
     SetName(name);

-       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_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_bitmap = bitmap;
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+          m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;

 
     m_windowStyle = style;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
 
     m_windowStyle = style;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );

-       SetBestSize( size ) ;
+    SetBestSize( size ) ;

     
     return ret;
 }
     
     return ret;
 }


@@ -67,7 +55,8 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;

-    SetSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
+    InvalidateBestSize();
+    SetSize(GetBestSize());

     Refresh() ;
 }
 
     Refresh() ;
 }
 


@@ -76,11 +65,20 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
     wxPaintDC dc(this);
     PrepareDC(dc);
 
     wxPaintDC dc(this);
     PrepareDC(dc);
 

-    dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+    if (m_bitmap.Ok())
+    {
+        dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+    }

 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {

-    return wxWindow::DoGetBestSize() ;
+    if ( m_bitmap.Ok() )
+        return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) );
+
+    // this is completely arbitrary
+    return DoGetSizeFromClientSize( wxSize(16, 16) ); 

 }
 
 }
 

+#endif
+