Changed the OSS backend to detect if the DSP requires a conversion of

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 26143fcf664196a24d5551942e05b64061203ff2..92af78fd5374fc93b92dd6bf04ec31843f09ca25 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -780,21 +780,21 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
 
 void
 wxDC::DoDrawPolyPolygon(int n,
-                        int start[],
+                        int count[],
                         wxPoint points[],
                         wxCoord xoffset,
                         wxCoord yoffset,
                         int fillStyle)
 {
 #ifdef __WXWINCE__
-    wxDCBase::DoDrawPolyPolygon(n, start, points, xoffset, yoffset, fillStyle);
+    wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
 #else    
     WXMICROWIN_CHECK_HDC
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
     int i, cnt;
     for (i = cnt = 0; i < n; i++)
-        cnt += start[i];
+        cnt += count[i];
 
     // Do things less efficiently if we have offsets
     if (xoffset != 0 || yoffset != 0)
@@ -810,7 +810,7 @@ wxDC::DoDrawPolyPolygon(int n,
 #ifndef __WXWINCE__
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
 #endif        
-        (void)PolyPolygon(GetHdc(), cpoints, start, n);
+        (void)PolyPolygon(GetHdc(), cpoints, count, n);
 #ifndef __WXWINCE__
         SetPolyFillMode(GetHdc(),prev);
 #endif        
@@ -824,7 +824,7 @@ wxDC::DoDrawPolyPolygon(int n,
 #ifndef __WXWINCE__
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
 #endif        
-        (void)PolyPolygon(GetHdc(), (POINT*) points, start, n);
+        (void)PolyPolygon(GetHdc(), (POINT*) points, count, n);
 #ifndef __WXWINCE__
         SetPolyFillMode(GetHdc(),prev);
 #endif        
@@ -2093,7 +2093,11 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                                      SRCCOPY
                                      ) == (int)GDI_ERROR )
                 {
-                    wxLogLastError(wxT("StretchDIBits"));
+                    // On Win9x this API fails most (all?) of the time, so
+                    // logging it becomes quite distracting.  Since it falls
+                    // back to the code below this is not really serious, so
+                    // don't log it.                     
+                    //wxLogLastError(wxT("StretchDIBits"));
                 }
                 else
                 {