Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / dc.cpp

diff --git a/src/palmos/dc.cpp b/src/palmos/dc.cpp
index 86e7abfcec720ae8ecdfaa2ca8912d81ab479e20..4a417aa61fdecb06dbd79d31086c05df675556d4 100644 (file)
--- a/src/palmos/dc.cpp
+++ b/src/palmos/dc.cpp
@@ -44,10 +44,6 @@
 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 
-#ifdef wxHAVE_RAW_BITMAP
-#include "wx/rawbmp.h"
-#endif
-
 #include "wx/palmos/dc.h"
 
 #ifndef AC_SRC_ALPHA
@@ -201,17 +197,11 @@ wxPalmDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) c
 {
 }
 
-// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
-void wxPalmDCImpl::SetClippingHrgn(WXHRGN hrgn)
-{
-    wxCHECK_RET( hrgn, wxT("invalid clipping region") );
-}
-
 void wxPalmDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
 }
 
-void wxPalmDCImpl::DoSetClippingRegionAsRegion(const wxRegion& region)
+void wxPalmDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
 {
 }
 
@@ -249,7 +239,7 @@ void wxPalmDCImpl::Clear()
 bool wxPalmDCImpl::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
                        wxCoord WXUNUSED_IN_WINCE(y),
                        const wxColour& WXUNUSED_IN_WINCE(col),
-                       int WXUNUSED_IN_WINCE(style))
+                       wxFloodFillStyle WXUNUSED_IN_WINCE(style))
 {
     return false;
 }
@@ -288,7 +278,7 @@ void wxPalmDCImpl::DoDrawPolygon(int n,
                          wxPoint points[],
                          wxCoord xoffset,
                          wxCoord yoffset,
-                         int WXUNUSED_IN_WINCE(fillStyle))
+                         wxPolygonFillMode WXUNUSED_IN_WINCE(fillStyle))
 {
 }
 
@@ -298,7 +288,7 @@ wxPalmDCImpl::DoDrawPolyPolygon(int n,
                         wxPoint points[],
                         wxCoord xoffset,
                         wxCoord yoffset,
-                        int fillStyle)
+                        wxPolygonFillMode fillStyle)
 {
 }
 
@@ -394,7 +384,7 @@ void wxPalmDCImpl::SetBackgroundMode(int mode)
 {
 }
 
-void wxPalmDCImpl::SetLogicalFunction(int function)
+void wxPalmDCImpl::SetLogicalFunction(wxRasterOperationMode function)
 {
 }
 
@@ -453,7 +443,7 @@ void wxPalmDCImpl::RealizeScaleAndOrigin()
 {
 }
 
-void wxPalmDCImpl::SetMapMode(int mode)
+void wxPalmDCImpl::SetMapMode(wxMappingMode mode)
 {
 }
 
@@ -482,7 +472,7 @@ bool wxPalmDCImpl::DoBlit(wxCoord dstX, wxCoord dstY,
                   wxCoord dstWidth, wxCoord dstHeight,
                   wxDC *source,
                   wxCoord srcX, wxCoord srcY,
-                  int rop, bool useMask,
+                  wxRasterOperationMode rop, bool useMask,
                   wxCoord srcMaskX, wxCoord srcMaskY)
 {
     return false;
@@ -493,7 +483,7 @@ bool wxPalmDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,
                          wxCoord srcWidth, wxCoord srcHeight,
-                         int rop, bool useMask,
+                         wxRasterOperationMode rop, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask)
 {
     return false;