adding implementation for osx

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

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 3dea79e650d8a122531f55ac3bbfcf7cc2f4ea5f..d1e8ddea76d5e76b56b89ecc93c7511ed934ebd9 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -927,9 +927,9 @@ void wxDCImpl::DoDrawSpline( const wxPointList *points )
     wx_spline_add_point(x1, y1);
 
     while ((node = node->GetNext())
     wx_spline_add_point(x1, y1);
 
     while ((node = node->GetNext())

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

            != NULL
            != NULL

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS

           )
     {
         p = node->GetData();
           )
     {
         p = node->GetData();


@@ -1182,7 +1182,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 +1224,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 */);
 


@@ -1602,7 +1602,7 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points,
             y2 = y2-y-y+1;
             --y;
         }
             y2 = y2-y-y+1;
             --y;
         }

-        // old y now to big: set point with old y, old x
+        // old y now too big: set point with old y, old x

         if( bNewPoint && x>1)
         {
             int x1 = x - 1;
         if( bNewPoint && x>1)
         {
             int x1 = x - 1;