Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/osx/carbon/statbmp.cpp b/src/osx/carbon/statbmp.cpp
index ab6915452ac620f3150803338c0581d719f6854e..51c59cb55cfdf569be640a81d3d5d8e7f4881040 100644 (file)
--- a/src/osx/carbon/statbmp.cpp
+++ b/src/osx/carbon/statbmp.cpp
@@ -19,8 +19,6 @@
     #include "wx/dcclient.h"
 #endif
 
     #include "wx/dcclient.h"
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-

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


@@ -68,7 +66,7 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
     wxPaintDC dc(this);
     PrepareDC(dc);
 
     wxPaintDC dc(this);
     PrepareDC(dc);
 

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

     {
         dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
     }
     {
         dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
     }


@@ -76,7 +74,7 @@ void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {

-    if ( m_bitmap.Ok() )
+    if ( m_bitmap.IsOk() )

         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