fixing osx_carbon

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 02f5ee8a3ee1a2d7e0c0a51943a52bfdaf409f36..a8b4420651dbc80747ec2d5311f89ecd47a41c46 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -35,6 +35,7 @@
 #ifndef WX_PRECOMP
     #include "wx/math.h"
     #include "wx/module.h"
 #ifndef WX_PRECOMP
     #include "wx/math.h"
     #include "wx/module.h"

+    #include "wx/window.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__


@@ -1182,7 +1183,7 @@ void wxDC::DrawLabel(const wxString& text,
     GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
 
     wxCoord width, height;
     GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
 
     wxCoord width, height;

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

     {
         width = widthText + bitmap.GetWidth();
         height = bitmap.GetHeight();
     {
         width = widthText + bitmap.GetWidth();
         height = bitmap.GetHeight();


@@ -1224,7 +1225,7 @@ void wxDC::DrawLabel(const wxString& text,
     wxCoord x0 = x,
             y0 = y,
             width0 = width;
     wxCoord x0 = x,
             y0 = y,
             width0 = width;

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

     {
         DrawBitmap(bitmap, x, y, true /* use mask */);
 
     {
         DrawBitmap(bitmap, x, y, true /* use mask */);