fixing osx_carbon

[wxWidgets.git] / src / html / m_image.cpp

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index fcccbd11a36b5e315d771d044b7403c7b747d7b4..60fee4e25ea099eb14f91a70ccdb1e9a9ab2f099 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -417,7 +417,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
 #endif // wxUSE_GIF && wxUSE_TIMER
                 {
                     wxImage image(*s, wxBITMAP_TYPE_ANY);
-                    if ( image.Ok() )
+                    if ( image.IsOk() )
                         SetImage(image);
                 }
             }
@@ -446,7 +446,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
 void wxHtmlImageCell::SetImage(const wxImage& img)
 {
 #if !defined(__WXMSW__) || wxUSE_WXDIB
-    if ( img.Ok() )
+    if ( img.IsOk() )
     {
         delete m_bitmap;
 
@@ -534,11 +534,11 @@ void wxHtmlImageCell::Layout(int w)
         if (!m_bmpHpresent && m_bitmap != NULL)
             m_Height = m_bitmap->GetHeight()*m_Width/m_bitmap->GetWidth();
         else
-            m_Height = m_scale*m_bmpH;
+            m_Height = static_cast<int>(m_scale*m_bmpH);
     } else
     {
-        m_Width  = m_scale*m_bmpW;
-        m_Height = m_scale*m_bmpH;
+        m_Width  = static_cast<int>(m_scale*m_bmpW);
+        m_Height = static_cast<int>(m_scale*m_bmpH);
     }
 
     switch (m_align)