Use new function GetItemLabel

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index e7ce2f1633631d9903085bbfcd66d89d09a144fb..8948b0c3e592be5bc9179870cae0d52323b5afde 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -14,7 +14,10 @@
 #if wxUSE_STATBMP
 
 #include "wx/statbmp.h"
 #if wxUSE_STATBMP
 
 #include "wx/statbmp.h"

-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+#endif

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


@@ -39,7 +42,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_bitmap = bitmap;
     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;


@@ -47,8 +50,8 @@ 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;
 }
 
     return ret;
 }
 


@@ -60,7 +63,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     Refresh() ;
 }
 
     Refresh() ;
 }
 

-void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) 
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
     wxPaintDC dc(this);
     PrepareDC(dc);
 {
     wxPaintDC dc(this);
     PrepareDC(dc);


@@ -77,8 +80,7 @@ wxSize wxStaticBitmap::DoGetBestSize() const
         return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) );
 
     // this is completely arbitrary
         return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) );
 
     // this is completely arbitrary

-    return DoGetSizeFromClientSize( wxSize(16, 16) ); 
+    return DoGetSizeFromClientSize( wxSize(16, 16) );

 }
 
 #endif
 }
 
 #endif

-