Applied patch [ 774886 ] wxnotebook bug

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 06fbd633bb04cfea2780ea22261144a27ca9997e..52e247fce2f9f1fadb3a6416c08e27678cd83839 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -40,6 +40,8 @@
     #include "wx/icon.h"
 #endif
 
     #include "wx/icon.h"
 #endif
 

+#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
+

 #include "wx/sysopt.h"
 #include "wx/dcprint.h"
 #include "wx/module.h"
 #include "wx/sysopt.h"
 #include "wx/dcprint.h"
 #include "wx/module.h"


@@ -52,8 +54,6 @@
 #include <string.h>
 #include <math.h>
 
 #include <string.h>
 #include <math.h>
 

-#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
-

 #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>
 #endif
 #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>
 #endif


@@ -158,6 +158,8 @@ private:
     COLORREF m_colFgOld, m_colBgOld;
 
     bool m_changed;
     COLORREF m_colFgOld, m_colBgOld;
 
     bool m_changed;

+
+    DECLARE_NO_COPY_CLASS(wxColourChanger)

 };
 
 // this class saves the old stretch blit mode during its life time
 };
 
 // this class saves the old stretch blit mode during its life time


@@ -167,21 +169,27 @@ public:
     StretchBltModeChanger(HDC hdc, int mode)
         : m_hdc(hdc)
     {
     StretchBltModeChanger(HDC hdc, int mode)
         : m_hdc(hdc)
     {

+#ifndef __WXWINCE__

         m_modeOld = ::SetStretchBltMode(m_hdc, mode);
         if ( !m_modeOld )
             wxLogLastError(_T("SetStretchBltMode"));
         m_modeOld = ::SetStretchBltMode(m_hdc, mode);
         if ( !m_modeOld )
             wxLogLastError(_T("SetStretchBltMode"));

+#endif

     }
 
     ~StretchBltModeChanger()
     {
     }
 
     ~StretchBltModeChanger()
     {

+#ifndef __WXWINCE__

         if ( !::SetStretchBltMode(m_hdc, m_modeOld) )
             wxLogLastError(_T("SetStretchBltMode"));
         if ( !::SetStretchBltMode(m_hdc, m_modeOld) )
             wxLogLastError(_T("SetStretchBltMode"));

+#endif

     }
 
 private:
     const HDC m_hdc;
 
     int m_modeOld;
     }
 
 private:
     const HDC m_hdc;
 
     int m_modeOld;

+
+    DECLARE_NO_COPY_CLASS(StretchBltModeChanger)

 };
 
 // ===========================================================================
 };
 
 // ===========================================================================


@@ -374,7 +382,7 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn)
     // note that we combine the new clipping region with the existing one: this
     // is compatible with what the other ports do and is the documented
     // behaviour now (starting with 2.3.3)
     // note that we combine the new clipping region with the existing one: this
     // is compatible with what the other ports do and is the documented
     // behaviour now (starting with 2.3.3)

-#ifdef __WIN16__
+#if defined(__WIN16__) || defined(__WXWINCE__)

     RECT rectClip;
     if ( !::GetClipBox(GetHdc(), &rectClip) )
         return;
     RECT rectClip;
     if ( !::GetClipBox(GetHdc(), &rectClip) )
         return;


@@ -510,7 +518,9 @@ void wxDC::Clear()
         rect.bottom = m_selectedBitmap.GetHeight();
     }
 
         rect.bottom = m_selectedBitmap.GetHeight();
     }
 

+#ifndef __WXWINCE__

     (void) ::SetMapMode(GetHdc(), MM_TEXT);
     (void) ::SetMapMode(GetHdc(), MM_TEXT);

+#endif

 
     DWORD colour = ::GetBkColor(GetHdc());
     HBRUSH brush = ::CreateSolidBrush(colour);
 
     DWORD colour = ::GetBkColor(GetHdc());
     HBRUSH brush = ::CreateSolidBrush(colour);


@@ -520,15 +530,22 @@ void wxDC::Clear()
     int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
         height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
 
     int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
         height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
 

+#ifndef __WXWINCE__

     ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
     ::SetMapMode(GetHdc(), MM_ANISOTROPIC);

+

     ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
     ::SetWindowExtEx(GetHdc(), width, height, NULL);
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
     ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
     ::SetWindowExtEx(GetHdc(), width, height, NULL);
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);

+#endif

 }
 
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 {
 }
 
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 {

+#ifdef __WXWINCE__
+    return FALSE;
+#else
+

 #ifdef __WXMICROWIN__
     if (!GetHDC()) return FALSE;
 #endif
 #ifdef __WXMICROWIN__
     if (!GetHDC()) return FALSE;
 #endif


@@ -557,6 +574,7 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
     CalcBoundingBox(x, y);
     
     return success;
     CalcBoundingBox(x, y);
     
     return success;

+#endif

 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const


@@ -586,11 +604,8 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y)
     wxCoord x2 = x+VIEWPORT_EXTENT;
     wxCoord y2 = y+VIEWPORT_EXTENT;
 
     wxCoord x2 = x+VIEWPORT_EXTENT;
     wxCoord y2 = y+VIEWPORT_EXTENT;
 

-    (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), NULL);
-    (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y));
-
-    (void)MoveToEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y1), NULL);
-    (void)LineTo(GetHdc(), XLOG2DEV(x), YLOG2DEV(y2));
+    wxDrawLine(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y));
+    wxDrawLine(GetHdc(), XLOG2DEV(x), YLOG2DEV(y1), XLOG2DEV(x), YLOG2DEV(y2));

 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);
 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);


@@ -602,8 +617,7 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     if (!GetHDC()) return;
 #endif
 
     if (!GetHDC()) return;
 #endif
 

-    (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
-    (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
+    wxDrawLine(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2));

 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);
 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);


@@ -615,6 +629,10 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {

+#ifdef __WXWINCE__
+    // FIXME: emulate Arc
+#else
+

 #ifdef __WXMICROWIN__
     if (!GetHDC()) return;
 #endif
 #ifdef __WXMICROWIN__
     if (!GetHDC()) return;
 #endif


@@ -662,6 +680,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
 
     CalcBoundingBox(xc - r, yc - r);
     CalcBoundingBox(xc + r, yc + r);
 
     CalcBoundingBox(xc - r, yc - r);
     CalcBoundingBox(xc + r, yc + r);

+#endif

 }
 
 void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
 }
 
 void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,


@@ -681,7 +700,11 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     rect.right  = x2;
     rect.bottom = y2;
 
     rect.right  = x2;
     rect.bottom = y2;
 

+#ifdef __WXWINCE__
+    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK);
+#else

     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);

+#endif

 #else // Win16
     // In WIN16, draw a cross
     HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
 #else // Win16
     // In WIN16, draw a cross
     HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));


@@ -740,9 +763,13 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
 
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }
 
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }

+#ifndef __WXWINCE__

         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

+#endif

         (void)Polygon(GetHdc(), cpoints, n);
         (void)Polygon(GetHdc(), cpoints, n);

+#ifndef __WXWINCE__

         SetPolyFillMode(GetHdc(),prev);
         SetPolyFillMode(GetHdc(),prev);

+#endif

         delete[] cpoints;
     }
     else
         delete[] cpoints;
     }
     else


@@ -751,9 +778,13 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);
 
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);
 

+#ifndef __WXWINCE__

         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

+#endif

         (void)Polygon(GetHdc(), (POINT*) points, n);
         (void)Polygon(GetHdc(), (POINT*) points, n);

+#ifndef __WXWINCE__

         SetPolyFillMode(GetHdc(),prev);
         SetPolyFillMode(GetHdc(),prev);

+#endif

     }
 }
 
     }
 }
 


@@ -889,6 +920,10 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
 void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
 void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {

+#ifdef __WXWINCE__
+    // FIXME
+#else
+

 #ifdef __WXMICROWIN__
     if (!GetHDC()) return;
 #endif
 #ifdef __WXMICROWIN__
     if (!GetHDC()) return;
 #endif


@@ -932,6 +967,7 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);

+#endif

 }
 
 void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 }
 
 void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)


@@ -1122,11 +1158,19 @@ void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
     SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
                                                           : OPAQUE);
 
     SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
                                                           : OPAQUE);
 

+#ifdef __WXWINCE__
+    if ( ::ExtTextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), 0, NULL,
+                   text.c_str(), text.length(), NULL) == 0 )
+    {
+        wxLogLastError(wxT("TextOut"));
+    }
+#else

     if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                    text.c_str(), text.length()) == 0 )
     {
         wxLogLastError(wxT("TextOut"));
     }
     if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                    text.c_str(), text.length()) == 0 )
     {
         wxLogLastError(wxT("TextOut"));
     }

+#endif

 
     // restore the old parameters (text foreground colour may be left because
     // it never is set to anything else, but background should remain
 
     // restore the old parameters (text foreground colour may be left because
     // it never is set to anything else, but background should remain


@@ -1399,40 +1443,9 @@ void wxDC::SetBackground(const wxBrush& brush)
 
     m_backgroundBrush = brush;
 
 
     m_backgroundBrush = brush;
 

-    if (!m_backgroundBrush.Ok())
-        return;
-
-    if (m_canvas)
-    {
-        bool customColours = TRUE;
-        // If we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to
-        // change background colours from the control-panel specified colours.
-        if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
-            customColours = FALSE;
-
-        if (customColours)
-        {
-            if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
-            {
-                m_canvas->SetTransparent(TRUE);
-            }
-            else
-            {
-                // New behaviour, 10/2/99: setting the background brush of a DC
-                // doesn't affect the window background colour. However,
-                // I'm leaving in the transparency setting because it's needed by
-                // various controls (e.g. wxStaticText) to determine whether to draw
-                // transparently or not. TODO: maybe this should be a new function
-                // wxWindow::SetTransparency(). Should that apply to the child itself, or the
-                // parent?
-                //        m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
-                m_canvas->SetTransparent(FALSE);
-            }
-        }
-    }
-    COLORREF new_color = m_backgroundBrush.GetColour().GetPixel();
+    if ( m_backgroundBrush.Ok() )

     {
     {

-        (void)SetBkColor(GetHdc(), new_color);
+        (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());

     }
 }
 
     }
 }
 


@@ -1615,8 +1628,8 @@ void wxDC::SetMapMode(int mode)
             return;
         }
 
             return;
         }
 

-        double mm2pixelsX = pixel_width / mm_width,
-               mm2pixelsY = pixel_height / mm_height;
+        double mm2pixelsX = (double)pixel_width / mm_width,
+               mm2pixelsY = (double)pixel_height / mm_height;

 
         switch (mode)
         {
 
         switch (mode)
         {


@@ -1648,6 +1661,7 @@ void wxDC::SetMapMode(int mode)
     // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
     //     cases we could do with MM_TEXT and in the remaining 0.9% with
     //     MM_ISOTROPIC (TODO!)
     // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
     //     cases we could do with MM_TEXT and in the remaining 0.9% with
     //     MM_ISOTROPIC (TODO!)

+#ifndef __WXWINCE__

     ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
 
     int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
     ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
 
     int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,


@@ -1658,6 +1672,7 @@ void wxDC::SetMapMode(int mode)
 
     ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
 
     ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);

+#endif

 }
 
 void wxDC::SetUserScale(double x, double y)
 }
 
 void wxDC::SetUserScale(double x, double y)


@@ -1666,6 +1681,7 @@ void wxDC::SetUserScale(double x, double y)
     if (!GetHDC()) return;
 #endif
 
     if (!GetHDC()) return;
 #endif
 

+#ifndef __WXWINCE__

     if ( x == m_userScaleX && y == m_userScaleY )
         return;
 
     if ( x == m_userScaleX && y == m_userScaleY )
         return;
 


@@ -1673,6 +1689,7 @@ void wxDC::SetUserScale(double x, double y)
     m_userScaleY = y;
 
     SetMapMode(m_mappingMode);
     m_userScaleY = y;
 
     SetMapMode(m_mappingMode);

+#endif

 }
 
 void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
 }
 
 void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)


@@ -1681,6 +1698,7 @@ void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
     if (!GetHDC()) return;
 #endif
 
     if (!GetHDC()) return;
 #endif
 

+#ifndef __WXWINCE__

     int signX = xLeftRight ? 1 : -1,
         signY = yBottomUp ? -1 : 1;
 
     int signX = xLeftRight ? 1 : -1,
         signY = yBottomUp ? -1 : 1;
 


@@ -1691,6 +1709,7 @@ void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
 
         SetMapMode(m_mappingMode);
     }
 
         SetMapMode(m_mappingMode);
     }

+#endif

 }
 
 void wxDC::SetSystemScale(double x, double y)
 }
 
 void wxDC::SetSystemScale(double x, double y)


@@ -1699,6 +1718,7 @@ void wxDC::SetSystemScale(double x, double y)
     if (!GetHDC()) return;
 #endif
 
     if (!GetHDC()) return;
 #endif
 

+#ifndef __WXWINCE__

     if ( x == m_scaleX && y == m_scaleY )
         return;
 
     if ( x == m_scaleX && y == m_scaleY )
         return;
 


@@ -1706,6 +1726,7 @@ void wxDC::SetSystemScale(double x, double y)
     m_scaleY = y;
 
     SetMapMode(m_mappingMode);
     m_scaleY = y;
 
     SetMapMode(m_mappingMode);

+#endif

 }
 
 void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
 }
 
 void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)


@@ -1714,6 +1735,7 @@ void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
     if (!GetHDC()) return;
 #endif
 
     if (!GetHDC()) return;
 #endif
 

+#ifndef __WXWINCE__

     if ( x == m_logicalOriginX && y == m_logicalOriginY )
         return;
 
     if ( x == m_logicalOriginX && y == m_logicalOriginY )
         return;
 


@@ -1721,6 +1743,7 @@ void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
     m_logicalOriginY = y;
 
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
     m_logicalOriginY = y;
 
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);

+#endif

 }
 
 void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 }
 
 void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)


@@ -1729,6 +1752,7 @@ void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
     if (!GetHDC()) return;
 #endif
 
     if (!GetHDC()) return;
 #endif
 

+#ifndef __WXWINCE__

     if ( x == m_deviceOriginX && y == m_deviceOriginY )
         return;
 
     if ( x == m_deviceOriginX && y == m_deviceOriginY )
         return;
 


@@ -1736,6 +1760,7 @@ void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
     m_deviceOriginY = y;
 
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
     m_deviceOriginY = y;
 
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);

+#endif

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1981,6 +2006,9 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
     {
         // if we already have a DIB, draw it using StretchDIBits(), otherwise
         // use StretchBlt() if available and finally fall back to BitBlt()
     {
         // if we already have a DIB, draw it using StretchDIBits(), otherwise
         // use StretchBlt() if available and finally fall back to BitBlt()

+
+        // FIXME: use appropriate WinCE functions
+#ifndef __WXWINCE__

         const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);
         if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) )
         {
         const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);
         if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) )
         {


@@ -2053,6 +2081,8 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                 success = TRUE;
             }
         }
                 success = TRUE;
             }
         }

+#endif
+        // __WXWINCE__

     }
 
     ::SetTextColor(GetHdc(), old_textground);
     }
 
     ::SetTextColor(GetHdc(), old_textground);


@@ -2170,7 +2200,7 @@ wxDCCacheEntry::~wxDCCacheEntry()
 wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
 wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);

-    wxNode* node = sm_bitmapCache.GetFirst();
+    wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();

     while (node)
     {
         wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();
     while (node)
     {
         wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();


@@ -2206,7 +2236,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
 wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
 wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);

-    wxNode* node = sm_dcCache.GetFirst();
+    wxList::compatibility_iterator node = sm_dcCache.GetFirst();

     while (node)
     {
         wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();
     while (node)
     {
         wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();


@@ -2244,12 +2274,8 @@ void wxDC::AddToDCCache(wxDCCacheEntry* entry)
 
 void wxDC::ClearCache()
 {
 
 void wxDC::ClearCache()
 {

-    sm_dcCache.DeleteContents(TRUE);
-    sm_dcCache.Clear();
-    sm_dcCache.DeleteContents(FALSE);
-    sm_bitmapCache.DeleteContents(TRUE);
-    sm_bitmapCache.Clear();
-    sm_bitmapCache.DeleteContents(FALSE);
+    WX_CLEAR_LIST(wxList, sm_dcCache);
+    WX_CLEAR_LIST(wxList, sm_bitmapCache);

 }
 
 // Clean up cache at app exit
 }
 
 // Clean up cache at app exit


@@ -2280,7 +2306,7 @@ static bool AlphaBlt(HDC hdcDst,
     wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
 
     // do we have AlphaBlend() and company in the headers?
     wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
 
     // do we have AlphaBlend() and company in the headers?

-#ifdef AC_SRC_OVER
+#if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS

     // yes, now try to see if we have it during run-time
     typedef BOOL (WINAPI *AlphaBlend_t)(HDC,int,int,int,int,
                                         HDC,int,int,int,int,
     // yes, now try to see if we have it during run-time
     typedef BOOL (WINAPI *AlphaBlend_t)(HDC,int,int,int,int,
                                         HDC,int,int,int,int,