Define WXBUILDING in Xcode projects.

[wxWidgets.git] / include / wx / generic / dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index bc544c93fec5dc13e5a684eb0c0f1aa941dfd2c0..57b850068934e1079a4229ba91f77f15395c1035 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/generic/dcps.h
+// Name:        wx/generic/dcpsg.h

 // Purpose:     wxPostScriptDC class
 // Author:      Julian Smart and others
 // Modified by:
 // Purpose:     wxPostScriptDC class
 // Author:      Julian Smart and others
 // Modified by:


@@ -94,8 +94,10 @@ public:
     virtual int GetResolution() const;
     virtual wxRect GetPaperRect() const;
 
     virtual int GetResolution() const;
     virtual wxRect GetPaperRect() const;
 

+    virtual void* GetHandle() const { return NULL; }
+    

 protected:
 protected:

-    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, 
+    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,

                      wxFloodFillStyle style = wxFLOOD_SURFACE);
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
                      wxFloodFillStyle style = wxFLOOD_SURFACE);
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);


@@ -103,12 +105,12 @@ protected:
     void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc);
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);
     void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc);
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);

-    void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
-    void DoDrawPolygon(int n, wxPoint points[], 
-                       wxCoord xoffset = 0, wxCoord yoffset = 0, 
+    void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
+    void DoDrawPolygon(int n, const wxPoint points[],
+                       wxCoord xoffset = 0, wxCoord yoffset = 0,

                        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
                        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);

-    void DoDrawPolyPolygon(int n, int count[], wxPoint points[], 
-                           wxCoord xoffset = 0, wxCoord yoffset = 0, 
+    void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
+                           wxCoord xoffset = 0, wxCoord yoffset = 0,

                            wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
                            wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);


@@ -117,7 +119,7 @@ protected:
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-                wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+                wxDC *source, wxCoord xsrc, wxCoord ysrc,

                 wxRasterOperationMode rop = wxCOPY, bool useMask = false,
                 wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
                 wxRasterOperationMode rop = wxCOPY, bool useMask = false,
                 wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);