X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fce127d758a53bec28bce0c66f52a2e03ae9bf4b..02fd8b9b6186623ed61019ac7e69ed9a4ef16773:/include/wx/motif/dcclient.h?ds=sidebyside

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index cdab848448..b13f196eb4 100644
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
 // wxWindowDCImpl
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowDCImpl : public wxMotifDCImpl
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMotifDCImpl
 {
 public:
     wxWindowDCImpl(wxDC *owner);
@@ -42,7 +42,7 @@ public:
     virtual void SetBackground(const wxBrush& brush);
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
-    virtual void SetLogicalFunction( int function );
+    virtual void SetLogicalFunction( wxRasterOperationMode function );
 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
@@ -89,7 +89,7 @@ protected:
     void SetForegroundPixelWithLogicalFunction(WXPixel pixel);
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-        int style = wxFLOOD_SURFACE);
+                             wxFloodFillStyle style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
 
@@ -115,17 +115,17 @@ protected:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
-        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+        wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
 
     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset,
-        int fillStyle = wxODDEVEN_RULE);
+        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
 
     void DoGetSize( int *width, int *height ) const;
 
@@ -158,7 +158,7 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
 };
 
-class WXDLLEXPORT wxPaintDCImpl: public wxWindowDCImpl
+class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl
 {
 public:
     wxPaintDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
@@ -169,7 +169,7 @@ public:
     DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
 };
 
-class WXDLLEXPORT wxClientDCImpl: public wxWindowDCImpl
+class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl
 {
 public:
     wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }