Platform and compiler-specific checking for MSW and Mac now done

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

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index c18a9ddc8707a6d0b006c79fc80d8c15104403ad..f239d3bc013aca887a9703a01f305063f8e0945f 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -6,7 +6,7 @@
 // Created:     05/25/99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     05/25/99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -32,6 +32,8 @@
 
 #include <math.h>
 
 
 #include <math.h>
 

+// bool wxDCBase::sm_cacheing = FALSE;
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -67,13 +69,13 @@ void wxDCBase::DoDrawCheckMark(wxCoord x1, wxCoord y1,
 
 void wxDCBase::DrawLines(const wxList *list, wxCoord xoffset, wxCoord yoffset)
 {
 
 void wxDCBase::DrawLines(const wxList *list, wxCoord xoffset, wxCoord yoffset)
 {

-    int n = list->Number();
+    int n = list->GetCount();

     wxPoint *points = new wxPoint[n];
 
     int i = 0;
     wxPoint *points = new wxPoint[n];
 
     int i = 0;

-    for ( wxNode *node = list->First(); node; node = node->Next(), i++ )
+    for ( wxNode *node = list->GetFirst(); node; node = node->GetNext(), i++ )

     {
     {

-        wxPoint *point = (wxPoint *)node->Data();
+        wxPoint *point = (wxPoint *)node->GetData();

         points[i].x = point->x;
         points[i].y = point->y;
     }
         points[i].x = point->x;
         points[i].y = point->y;
     }


@@ -88,13 +90,13 @@ void wxDCBase::DrawPolygon(const wxList *list,
                            wxCoord xoffset, wxCoord yoffset,
                            int fillStyle)
 {
                            wxCoord xoffset, wxCoord yoffset,
                            int fillStyle)
 {

-    int n = list->Number();
+    int n = list->GetCount();

     wxPoint *points = new wxPoint[n];
 
     int i = 0;
     wxPoint *points = new wxPoint[n];
 
     int i = 0;

-    for ( wxNode *node = list->First(); node; node = node->Next(), i++ )
+    for ( wxNode *node = list->GetFirst(); node; node = node->GetNext(), i++ )

     {
     {

-        wxPoint *point = (wxPoint *)node->Data();
+        wxPoint *point = (wxPoint *)node->GetData();

         points[i].x = point->x;
         points[i].y = point->y;
     }
         points[i].x = point->x;
         points[i].y = point->y;
     }


@@ -129,9 +131,9 @@ void wxDCBase::DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoor
 
     DrawSpline(&point_list);
 
 
     DrawSpline(&point_list);
 

-    for( wxNode *node = point_list.First(); node; node = node->Next() )
+    for( wxNode *node = point_list.GetFirst(); node; node = node->GetNext() )

     {
     {

-        wxPoint *p = (wxPoint *)node->Data();
+        wxPoint *p = (wxPoint *)node->GetData();

         delete p;
     }
 }
         delete p;
     }
 }


@@ -252,13 +254,13 @@ static bool wx_spline_add_point(double x, double y)
 static void wx_spline_draw_point_array(wxDCBase *dc)
 {
   dc->DrawLines(&wx_spline_point_list, 0, 0 );
 static void wx_spline_draw_point_array(wxDCBase *dc)
 {
   dc->DrawLines(&wx_spline_point_list, 0, 0 );

-  wxNode *node = wx_spline_point_list.First();
+  wxNode *node = wx_spline_point_list.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxPoint *point = (wxPoint *)node->Data();
+    wxPoint *point = (wxPoint *)node->GetData();

     delete point;
     delete node;
     delete point;
     delete node;

-    node = wx_spline_point_list.First();
+    node = wx_spline_point_list.GetFirst();

   }
 }
 
   }
 }
 


@@ -270,14 +272,14 @@ void wxDCBase::DoDrawSpline( wxList *points )
     double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
     double           x1, y1, x2, y2;
 
     double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
     double           x1, y1, x2, y2;
 

-    wxNode *node = points->First();
-    p = (wxPoint *)node->Data();
+    wxNode *node = points->GetFirst();
+    p = (wxPoint *)node->GetData();

 
     x1 = p->x;
     y1 = p->y;
 
 
     x1 = p->x;
     y1 = p->y;
 

-    node = node->Next();
-    p = (wxPoint *)node->Data();
+    node = node->GetNext();
+    p = (wxPoint *)node->GetData();

 
     x2 = p->x;
     y2 = p->y;
 
     x2 = p->x;
     y2 = p->y;


@@ -288,9 +290,9 @@ void wxDCBase::DoDrawSpline( wxList *points )
 
     wx_spline_add_point(x1, y1);
 
 
     wx_spline_add_point(x1, y1);
 

-    while ((node = node->Next()) != NULL)
+    while ((node = node->GetNext()) != NULL)

     {
     {

-        p = (wxPoint *)node->Data();
+        p = (wxPoint *)node->GetData();

         x1 = x2;
         y1 = y2;
         x2 = p->x;
         x1 = x2;
         y1 = y2;
         x2 = p->x;


@@ -326,8 +328,8 @@ void wxDCBase::GetMultiLineTextExtent(const wxString& text,
                                       wxCoord *h,
                                       wxFont *font)
 {
                                       wxCoord *h,
                                       wxFont *font)
 {

-    int widthTextMax = 0, widthLine,
-        heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
+    wxCoord widthTextMax = 0, widthLine,
+            heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;

 
     wxString curLine;
     for ( const wxChar *pc = text; ; pc++ )
 
     wxString curLine;
     for ( const wxChar *pc = text; ; pc++ )


@@ -506,7 +508,7 @@ void wxDCBase::DrawLabel(const wxString& text,
         }
         else // not end of line
         {
         }
         else // not end of line
         {

-            if ( pc - text == indexAccel )
+            if ( pc - text.c_str() == indexAccel )

             {
                 // remeber to draw underscore here
                 GetTextExtent(curLine, &startUnderscore, NULL);
             {
                 // remeber to draw underscore here
                 GetTextExtent(curLine, &startUnderscore, NULL);