miscellaneous small enhancements

[wxWidgets.git] / interface / wx / dcsvg.h

diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h
index d2d19b570986f81511e2085a4bc7dca0a5c44e25..0efdf5a17b413e96145dcfe8434718f4cea798fa 100644 (file)
--- a/interface/wx/dcsvg.h
+++ b/interface/wx/dcsvg.h
@@ -56,7 +56,7 @@ public:
         @see wxDC::Blit()
     */
     bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-              wxDC* source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY,
+              wxDC* source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop = wxCOPY,
               bool useMask = false, wxCoord xsrcMask = wxDefaultCoord,
               wxCoord ysrcMask = wxDefaultCoord);
 
@@ -230,9 +230,11 @@ public:
         The programmer is responsible for deleting the list of points.
     */
     void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0,
-                     wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE);
+                     wxCoord yoffset = 0,
+                     wxPolygonFillMode fill_style = wxODDEVEN_RULE);
     void DrawPolygon(wxList* points, wxCoord xoffset = 0,
-                     wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE);
+                     wxCoord yoffset = 0,
+                     wxPolygonFillMode fill_style = wxODDEVEN_RULE);
     //@}
 
     /**
@@ -296,11 +298,6 @@ public:
     */
     void EndDoc();
 
-    /**
-        Does nothing.
-    */
-    void EndDrawing();
-
     /**
         Does nothing.
     */
@@ -310,7 +307,7 @@ public:
         Not implemented.
     */
     bool FloodFill(wxCoord x, wxCoord y, const wxColour& colour,
-                   int style = wxFLOOD_SURFACE);
+                   wxFloodFillStyle style = wxFLOOD_SURFACE);
 
     //@{
     /**
@@ -352,7 +349,7 @@ public:
     /**
         Not implemented.
     */
-    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height);
+    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) const;
 
     //@{
     /**
@@ -369,14 +366,14 @@ public:
 
         @see SetLogicalFunction()
     */
-    int GetLogicalFunction() const;
+    wxRasterOperationMode GetLogicalFunction() const;
 
     /**
         Gets the mapping mode for the device context.
 
         @see SetMapMode()
     */
-    int GetMapMode() const;
+    wxMappingMode GetMapMode() const;
 
     //@{
     /**
@@ -503,7 +500,7 @@ public:
         Returns @true if the DC is ok to use. @false values arise from being
         unable to write the file.
     */
-    bool Ok();
+    bool IsOk();
 
     /**
         Resets the bounding box. After a call to this function, the bounding
@@ -576,9 +573,9 @@ public:
 
     /**
         Does the same as wxDC::SetLogicalFunction(), except that only wxCOPY is
-        avalaible. Trying to set one of the othe values will fail.
+        available. Trying to set one of the other values will fail.
     */
-    void SetLogicalFunction(int function);
+    void SetLogicalFunction(wxRasterOperationMode function);
 
     /**
         The mapping mode of the device context defines the unit of measurement
@@ -604,7 +601,7 @@ public:
         - wxMM_LOMETRIC - Each logical unit is 1/10 of a mm.
         - wxMM_TEXT     - Each logical unit is 1 pixel.
     */
-    void SetMapMode(int mode);
+    void SetMapMode(wxMappingMode mode);
 
     /**
         Not implemented.