compilation fixes (apparently, gcc <3.4 didn't validate code in templates that were...

[wxWidgets.git] / include / wx / dc.h

diff --git a/include/wx/dc.h b/include/wx/dc.h
index a01bb775ca84f5f458a92a068a9e95da7024382f..f805dd61acd50d749cfc4d565626bd233f021dcf 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -211,10 +211,10 @@ public:
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 
-    void DrawPolyPolygon(int n, int start[], wxPoint points[],
+    void DrawPolyPolygon(int n, int count[], wxPoint points[],
                          wxCoord xoffset = 0, wxCoord yoffset = 0,
                          int fillStyle = wxODDEVEN_RULE)
-        { DoDrawPolyPolygon(n, start, points, xoffset, yoffset, fillStyle); }
+        { DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); }
 
     void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
         { DoDrawRectangle(x, y, width, height); }
@@ -596,7 +596,6 @@ public:
     // ------------------
 
     // for compatibility with the old code when wxCoord was long everywhere
-#ifndef __WIN16__
     void GetTextExtent(const wxString& string,
                        long *x, long *y,
                        long *descent = NULL,
@@ -645,7 +644,6 @@ public:
         if (w) *w = ww;
         if (h) *h = hh;
     }
-#endif // !Win16
 
 protected:
     // the pure virtual functions which should be implemented by wxDC
@@ -695,7 +693,7 @@ protected:
     virtual void DoDrawPolygon(int n, wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                int fillStyle = wxODDEVEN_RULE) = 0;
-    virtual void DoDrawPolyPolygon(int n, int start[], wxPoint points[],
+    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                int fillStyle);