check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 68bc4efa6ac16f137f7604be33f235dfddf12ae3..8948b0c3e592be5bc9179870cae0d52323b5afde 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,27 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.cpp
+// Name:        src/mac/carbon/statbmp.cpp

 // Purpose:     wxStaticBitmap
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxStaticBitmap
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// 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/statbmp.h"

-#include "wx/dcclient.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"

 #endif
 
 #endif
 

+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+

 /*
  * wxStaticBitmap
  */
 /*
  * wxStaticBitmap
  */


@@ -33,25 +32,17 @@ 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;
 
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_bitmap = bitmap;

-    if ( id == -1 )
+    if ( id == wxID_ANY )

           m_windowId = (int)NewControlId();
     else
         m_windowId = id;
           m_windowId = (int)NewControlId();
     else
         m_windowId = id;


@@ -59,28 +50,37 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID 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 ) ;
-    
+    SetInitialSize( size ) ;
+

     return ret;
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;
     return ret;
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;

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

     Refresh() ;
 }
 
     Refresh() ;
 }
 

-void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) 
+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