Added back shlwapi.h inclusion with comment

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index a795a51b5e0f52b20a7a0fd6b8d23fbd4d4acfdf..9f7482b9bd1afd0ce47438d624a27e25330ae3c6 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dc.h"
 #endif
 
     #pragma implementation "dc.h"
 #endif
 


@@ -29,6 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/image.h"

     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/utils.h"


@@ -50,14 +51,8 @@
 #endif
 
 #include <string.h>
 #endif
 
 #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

 
 

+#include "wx/msw/wrapcdlg.h"

 #ifndef __WIN32__
     #include <print.h>
 #endif
 #ifndef __WIN32__
     #include <print.h>
 #endif


@@ -71,6 +66,16 @@
 #define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore))
 #endif
 
 #define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore))
 #endif
 

+// apparently with MicroWindows it is possible that HDC is 0 so we have to
+// check for this ourselves
+#ifdef __WXMICROWIN__
+    #define WXMICROWIN_CHECK_HDC if ( !GetHDC() ) return;
+    #define WXMICROWIN_CHECK_HDC_RET(x) if ( !GetHDC() ) return x;
+#else
+    #define WXMICROWIN_CHECK_HDC
+    #define WXMICROWIN_CHECK_HDC_RET(x)
+#endif
+

 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
 
 // ---------------------------------------------------------------------------
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
 
 // ---------------------------------------------------------------------------


@@ -82,11 +87,6 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 

-// usually this is defined in math.h
-#ifndef M_PI
-    static const double M_PI = 3.14159265358979323846;
-#endif // M_PI
-

 // ROPs which don't have standard names (see "Ternary Raster Operations" in the
 // MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
 #define DSTCOPY 0x00AA0029      // a.k.a. NOP operation
 // ROPs which don't have standard names (see "Ternary Raster Operations" in the
 // MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
 #define DSTCOPY 0x00AA0029      // a.k.a. NOP operation


@@ -102,13 +102,17 @@ static const int MM_METRIC = 10;
    coordinates used.
  */
 
    coordinates used.
  */
 

-// logical to device
-#define XLOG2DEV(x) (x)
-#define YLOG2DEV(y) (y)
-
-// device to logical
-#define XDEV2LOG(x) (x)
-#define YDEV2LOG(y) (y)
+#ifdef __WXWINCE__
+    #define XLOG2DEV(x) ((x-m_logicalOriginX)*m_signX)
+    #define YLOG2DEV(y) ((y-m_logicalOriginY)*m_signY)
+    #define XDEV2LOG(x) ((x)*m_signX+m_logicalOriginX)
+    #define YDEV2LOG(y) ((y)*m_signY+m_logicalOriginY)
+#else
+    #define XLOG2DEV(x) (x)
+    #define YLOG2DEV(y) (y)
+    #define XDEV2LOG(x) (x)
+    #define YDEV2LOG(y) (y)
+#endif

 
 // ---------------------------------------------------------------------------
 // private functions
 
 // ---------------------------------------------------------------------------
 // private functions


@@ -158,6 +162,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 +173,29 @@ 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"));

+#else
+        wxUnusedVar(mode);
+#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)

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


@@ -201,7 +215,7 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
         m_colFgOld = ::GetTextColor(hdc);
         m_colBgOld = ::GetBkColor(hdc);
 
         m_colFgOld = ::GetTextColor(hdc);
         m_colBgOld = ::GetBkColor(hdc);
 

-        // note that Windows convention is opposite to wxWindows one, this is
+        // note that Windows convention is opposite to wxWidgets one, this is

         // why text colour becomes the background one and vice versa
         const wxColour& colFg = dc.GetTextForeground();
         if ( colFg.Ok() )
         // why text colour becomes the background one and vice versa
         const wxColour& colFg = dc.GetTextForeground();
         if ( colFg.Ok() )


@@ -220,12 +234,12 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
                                                           : OPAQUE);
 
         // flag which telsl us to undo changes in the dtor
                                                           : OPAQUE);
 
         // flag which telsl us to undo changes in the dtor

-        m_changed = TRUE;
+        m_changed = true;

     }
     else
     {
         // nothing done, nothing to undo
     }
     else
     {
         // nothing done, nothing to undo

-        m_changed = FALSE;
+        m_changed = false;

     }
 }
 
     }
 }
 


@@ -259,7 +273,7 @@ wxDC::wxDC()
     m_oldPalette = 0;
 #endif // wxUSE_PALETTE
 
     m_oldPalette = 0;
 #endif // wxUSE_PALETTE
 

-    m_bOwnsDC = FALSE;
+    m_bOwnsDC = false;

     m_hDC = 0;
 }
 
     m_hDC = 0;
 }
 


@@ -349,9 +363,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
 
 void wxDC::UpdateClipBox()
 {
 
 void wxDC::UpdateClipBox()
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     RECT rect;
     ::GetClipBox(GetHdc(), &rect);
 
     RECT rect;
     ::GetClipBox(GetHdc(), &rect);


@@ -362,23 +374,45 @@ void wxDC::UpdateClipBox()
     m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom);
 }
 
     m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom);
 }
 

+void
+wxDC::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+{
+    // check if we should try to retrieve the clipping region possibly not set
+    // by our SetClippingRegion() but preset by Windows:this can only happen
+    // when we're associated with an existing HDC usign SetHDC(), see there
+    if ( m_clipping && !m_clipX1 && !m_clipX2 )
+    {
+        wxDC *self = wxConstCast(this, wxDC);
+        self->UpdateClipBox();
+
+        if ( !m_clipX1 && !m_clipX2 )
+            self->m_clipping = false;
+    }
+
+    wxDCBase::DoGetClippingBox(x, y, w, h);
+}
+

 // common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
 void wxDC::SetClippingHrgn(WXHRGN hrgn)
 {
     wxCHECK_RET( hrgn, wxT("invalid clipping region") );
 
 // common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
 void wxDC::SetClippingHrgn(WXHRGN hrgn)
 {
     wxCHECK_RET( hrgn, wxT("invalid clipping region") );
 

-#ifdef __WXMICROWIN__
-    if (!GetHdc()) return;
-#endif // __WXMICROWIN__
+    WXMICROWIN_CHECK_HDC

 
     // 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(__WXWINCE__)

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

+    // GetClipBox returns logical coordinates, so transform to device
+    rectClip.left = LogicalToDeviceX(rectClip.left);
+    rectClip.top = LogicalToDeviceY(rectClip.top);
+    rectClip.right = LogicalToDeviceX(rectClip.right);
+    rectClip.bottom = LogicalToDeviceY(rectClip.bottom);
+

     HRGN hrgnDest = ::CreateRectRgn(0, 0, 0, 0);
     HRGN hrgnClipOld = ::CreateRectRgn(rectClip.left, rectClip.top,
                                        rectClip.right, rectClip.bottom);
     HRGN hrgnDest = ::CreateRectRgn(0, 0, 0, 0);
     HRGN hrgnClipOld = ::CreateRectRgn(rectClip.left, rectClip.top,
                                        rectClip.right, rectClip.bottom);


@@ -390,16 +424,16 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn)
 
     ::DeleteObject(hrgnClipOld);
     ::DeleteObject(hrgnDest);
 
     ::DeleteObject(hrgnClipOld);
     ::DeleteObject(hrgnDest);

-#else // Win32
+#else // !WinCE

     if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
     {
         wxLogLastError(_T("ExtSelectClipRgn"));
 
         return;
     }
     if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
     {
         wxLogLastError(_T("ExtSelectClipRgn"));
 
         return;
     }

-#endif // Win16/32
+#endif // WinCE/!WinCE

 
 

-    m_clipping = TRUE;
+    m_clipping = true;

 
     UpdateClipBox();
 }
 
     UpdateClipBox();
 }


@@ -433,9 +467,7 @@ void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 
 void wxDC::DestroyClippingRegion()
 {
 
 void wxDC::DestroyClippingRegion()
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     if (m_clipping && m_hDC)
     {
 
     if (m_clipping && m_hDC)
     {


@@ -448,7 +480,7 @@ void wxDC::DestroyClippingRegion()
         ::DeleteObject(rgn);
     }
 
         ::DeleteObject(rgn);
     }
 

-    m_clipping = FALSE;
+    wxDCBase::DestroyClippingRegion();

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


@@ -457,14 +489,14 @@ void wxDC::DestroyClippingRegion()
 
 bool wxDC::CanDrawBitmap() const
 {
 
 bool wxDC::CanDrawBitmap() const
 {

-    return TRUE;
+    return true;

 }
 
 bool wxDC::CanGetTextExtent() const
 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function
 }
 
 bool wxDC::CanGetTextExtent() const
 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function

-    return TRUE;
+    return true;

 #else
     // What sort of display is it?
     int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
 #else
     // What sort of display is it?
     int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);


@@ -475,9 +507,7 @@ bool wxDC::CanGetTextExtent() const
 
 int wxDC::GetDepth() const
 {
 
 int wxDC::GetDepth() const
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return 16;
-#endif
+    WXMICROWIN_CHECK_HDC_RET(16)

 
     return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);
 }
 
     return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);
 }


@@ -488,9 +518,7 @@ int wxDC::GetDepth() const
 
 void wxDC::Clear()
 {
 
 void wxDC::Clear()
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     RECT rect;
     if ( m_canvas )
 
     RECT rect;
     if ( m_canvas )


@@ -510,28 +538,39 @@ 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);
     ::FillRect(GetHdc(), &rect, brush);
     ::DeleteObject(brush);
 
 
     DWORD colour = ::GetBkColor(GetHdc());
     HBRUSH brush = ::CreateSolidBrush(colour);
     ::FillRect(GetHdc(), &rect, brush);
     ::DeleteObject(brush);
 

+#ifndef __WXWINCE__

     int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
         height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
 
     ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
     int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
         height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
 
     ::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 __WXMICROWIN__
-    if (!GetHDC()) return FALSE;
-#endif
+#ifdef __WXWINCE__
+    wxUnusedVar(x);
+    wxUnusedVar(y);
+    wxUnusedVar(col);
+    wxUnusedVar(style);
+    return false;
+#else
+
+    WXMICROWIN_CHECK_HDC_RET(false)

 
     bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                          col.GetPixel(),
 
     bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                          col.GetPixel(),


@@ -555,42 +594,36 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
     }
 
     CalcBoundingBox(x, y);
     }
 
     CalcBoundingBox(x, y);

-    
+

     return success;
     return success;

+#endif

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

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return FALSE;
-#endif
+    WXMICROWIN_CHECK_HDC_RET(false)

 
 

-    wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel") );
+    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") );

 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
 
     wxRGBToColour(*col, pixelcolor);
 
 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
 
     wxRGBToColour(*col, pixelcolor);
 

-    return TRUE;
+    return true;

 }
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 {
 }
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxCoord x1 = x-VIEWPORT_EXTENT;
     wxCoord y1 = y-VIEWPORT_EXTENT;
     wxCoord x2 = x+VIEWPORT_EXTENT;
     wxCoord y2 = y+VIEWPORT_EXTENT;
 
 
     wxCoord x1 = x-VIEWPORT_EXTENT;
     wxCoord y1 = 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);


@@ -598,12 +631,9 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
 

-    (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,9 +645,16 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+#ifdef __WXWINCE__
+    // Slower emulation since WinCE doesn't support Pie and Arc
+    double r = sqrt( (x1-xc)*(x1-xc) + (y1-yc)*(y1-yc) );
+    double sa = acos((x1-xc)/r)/M_PI*180; // between 0 and 180
+    if( y1>yc ) sa = -sa; // below center
+    double ea = atan2(yc-y2, x2-xc)/M_PI*180;
+    DoDrawEllipticArcRot( xc-r, yc-r, 2*r, 2*r, sa, ea );
+#else
+
+    WXMICROWIN_CHECK_HDC

 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 


@@ -662,14 +699,13 @@ 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,
                            wxCoord width, wxCoord height)
 {
 }
 
 void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
                            wxCoord width, wxCoord height)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxCoord x2 = x1 + width,
             y2 = y1 + height;
 
     wxCoord x2 = x1 + width,
             y2 = y1 + height;


@@ -681,9 +717,13 @@ 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);

-#else // Win16
-    // In WIN16, draw a cross
+#endif
+#else // Symantec-MicroWin
+    // draw a cross

     HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
     HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH);
     HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen);
     HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
     HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH);
     HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen);


@@ -697,7 +737,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     ::SelectObject(GetHdc(), hPenOld);
     ::SelectObject(GetHdc(), hBrushOld);
     ::DeleteObject(blackPen);
     ::SelectObject(GetHdc(), hPenOld);
     ::SelectObject(GetHdc(), hBrushOld);
     ::DeleteObject(blackPen);

-#endif // Win32/16
+#endif // Win32/Symantec-MicroWin

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


@@ -705,9 +745,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
 
 void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 {
 
 void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     COLORREF color = 0x00ffffff;
     if (m_pen.Ok())
 
     COLORREF color = 0x00ffffff;
     if (m_pen.Ok())


@@ -722,9 +760,7 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 
 void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)
 {
 
 void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 


@@ -740,9 +776,15 @@ 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);

+#else
+        wxUnusedVar(fillStyle);
+#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,17 +793,74 @@ 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

     }
 }
 
     }
 }
 

-void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void
+wxDC::DoDrawPolyPolygon(int n,
+                        int count[],
+                        wxPoint points[],
+                        wxCoord xoffset,
+                        wxCoord yoffset,
+                        int fillStyle)

 {
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
+#ifdef __WXWINCE__
+    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 += count[i];
+
+    // Do things less efficiently if we have offsets
+    if (xoffset != 0 || yoffset != 0)
+    {
+        POINT *cpoints = new POINT[cnt];
+        for (i = 0; i < cnt; i++)
+        {
+            cpoints[i].x = (int)(points[i].x + xoffset);
+            cpoints[i].y = (int)(points[i].y + yoffset);
+
+            CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+        }
+#ifndef __WXWINCE__
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+#endif
+        (void)PolyPolygon(GetHdc(), cpoints, count, n);
+#ifndef __WXWINCE__
+        SetPolyFillMode(GetHdc(),prev);
+#endif
+        delete[] cpoints;
+    }
+    else
+    {
+        for (i = 0; i < cnt; i++)
+            CalcBoundingBox(points[i].x, points[i].y);
+
+#ifndef __WXWINCE__
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

 #endif
 #endif

+        (void)PolyPolygon(GetHdc(), (POINT*) points, count, n);
+#ifndef __WXWINCE__
+        SetPolyFillMode(GetHdc(),prev);
+#endif
+    }
+#endif
+  // __WXWINCE__
+}
+
+void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+{
+    WXMICROWIN_CHECK_HDC

 
     // Do things less efficiently if we have offsets
     if (xoffset != 0 || yoffset != 0)
 
     // Do things less efficiently if we have offsets
     if (xoffset != 0 || yoffset != 0)


@@ -790,9 +889,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 


@@ -817,8 +914,11 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
         // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR.
         if ( m_pen.GetStyle() == wxTRANSPARENT )
         {
         // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR.
         if ( m_pen.GetStyle() == wxTRANSPARENT )
         {

+            // Apparently not needed for WinCE (see e.g. Life! demo)
+#ifndef __WXWINCE__

             x2++;
             y2++;
             x2++;
             y2++;

+#endif

         }
 
         (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
         }
 
         (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));


@@ -831,9 +931,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 
 void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
 
 void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 


@@ -842,11 +940,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
 
     if (radius < 0.0)
     {
 
     if (radius < 0.0)
     {

-        double smallest = 0.0;
-        if (width < height)
-            smallest = width;
-        else
-            smallest = height;
+        double smallest = (width < height) ? width : height;

         radius = (- radius * smallest);
     }
 
         radius = (- radius * smallest);
     }
 


@@ -871,9 +965,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
 
 void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 


@@ -889,9 +981,11 @@ 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 __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+#ifdef __WXWINCE__
+    DoDrawEllipticArcRot( x, y, w, h, sa, ea );
+#else
+
+    WXMICROWIN_CHECK_HDC

 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 


@@ -932,13 +1026,12 @@ 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)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
 
 
     wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
 


@@ -954,9 +1047,7 @@ void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
 {
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
 
 
     wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
 


@@ -988,7 +1079,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter

-            useMask = FALSE;
+            useMask = false;

         }
     }
     if ( useMask )
         }
     }
     if ( useMask )


@@ -997,9 +1088,9 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         // use MaskBlt() with ROP which doesn't do anything to dst in the mask
         // points
         // On some systems, MaskBlt succeeds yet is much much slower
         // use MaskBlt() with ROP which doesn't do anything to dst in the mask
         // points
         // On some systems, MaskBlt succeeds yet is much much slower

-        // than the wxWindows fall-back implementation. So we need
+        // than the wxWidgets fall-back implementation. So we need

         // to be able to switch this on and off at runtime.
         // to be able to switch this on and off at runtime.

-        bool ok = FALSE;
+        bool ok = false;

 #if wxUSE_SYSTEM_OPTIONS
         if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
 #endif
 #if wxUSE_SYSTEM_OPTIONS
         if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
 #endif


@@ -1089,9 +1180,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 
 void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 {
 
 void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     DrawAnyText(text, x, y);
 
 
     DrawAnyText(text, x, y);
 


@@ -1105,9 +1194,7 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 
 void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
 {
 
 void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     // prepare for drawing the text
     if ( m_textForegroundColour.Ok() )
 
     // prepare for drawing the text
     if ( m_textForegroundColour.Ok() )


@@ -1122,11 +1209,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


@@ -1141,9 +1236,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
                              wxCoord x, wxCoord y,
                              double angle)
 {
                              wxCoord x, wxCoord y,
                              double angle)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     // we test that we have some font because otherwise we should still use the
     // "else" part below to avoid that DrawRotatedText(angle = 180) and
 
     // we test that we have some font because otherwise we should still use the
     // "else" part below to avoid that DrawRotatedText(angle = 180) and


@@ -1197,13 +1290,13 @@ void wxDC::DoDrawRotatedText(const wxString& text,
 
         // "upper left" and "upper right"
         CalcBoundingBox(x, y);
 
         // "upper left" and "upper right"
         CalcBoundingBox(x, y);

-        CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(h*sin(rad)));
+        CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));

 
         // "bottom left" and "bottom right"
         x += (wxCoord)(h*sin(rad));
         y += (wxCoord)(h*cos(rad));
         CalcBoundingBox(x, y);
 
         // "bottom left" and "bottom right"
         x += (wxCoord)(h*sin(rad));
         y += (wxCoord)(h*cos(rad));
         CalcBoundingBox(x, y);

-        CalcBoundingBox(x + wxCoord(h*sin(rad)), y + wxCoord(h*cos(rad)));
+        CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));

     }
 #endif
 }
     }
 #endif
 }


@@ -1216,9 +1309,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
 
 void wxDC::DoSelectPalette(bool realize)
 {
 
 void wxDC::DoSelectPalette(bool realize)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
 
     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.


@@ -1232,7 +1323,7 @@ void wxDC::DoSelectPalette(bool realize)
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),

-                                          FALSE);
+                                          false);

         if (!m_oldPalette)
             m_oldPalette = (WXHPALETTE) oldPal;
 
         if (!m_oldPalette)
             m_oldPalette = (WXHPALETTE) oldPal;
 


@@ -1246,7 +1337,7 @@ void wxDC::SetPalette(const wxPalette& palette)
     if ( palette.Ok() )
     {
         m_palette = palette;
     if ( palette.Ok() )
     {
         m_palette = palette;

-        DoSelectPalette(TRUE);
+        DoSelectPalette(true);

     }
 }
 
     }
 }
 


@@ -1271,131 +1362,143 @@ void wxDC::InitializePalette()
 
 #endif // wxUSE_PALETTE
 
 
 #endif // wxUSE_PALETTE
 

-void wxDC::SetFont(const wxFont& the_font)
-{
-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+// SetFont/Pen/Brush() really ask to be implemented as a single template
+// function... but doing it is not worth breaking OpenWatcom build <sigh>

 
 

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldFont)
-    {
-        ::SelectObject(GetHdc(), (HFONT) m_oldFont);
-        m_oldFont = 0;
-    }
+void wxDC::SetFont(const wxFont& font)
+{
+    WXMICROWIN_CHECK_HDC

 
 

-    m_font = the_font;
+    if ( font == m_font )
+        return;

 
 

-    if (!the_font.Ok())
+    if ( font.Ok() )

     {
     {

-        if (m_oldFont)
-            ::SelectObject(GetHdc(), (HFONT) m_oldFont);
-        m_oldFont = 0;
-    }
+        HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
+        if ( hfont == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(font)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldFont )
+                m_oldFont = (WXHPEN)hfont;

 
 

-    if (m_font.Ok() && m_font.GetResourceHandle())
+            m_font = font;
+        }
+    }
+    else // invalid font, reset the current font

     {
     {

-        HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
-        if (f == (HFONT) NULL)
+        if ( m_oldFont )

         {
         {

-            wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old font)"));
+            }
+
+            m_oldFont = 0;

         }
         }

-        if (!m_oldFont)
-            m_oldFont = (WXHFONT) f;
+
+        m_font = wxNullFont;

     }
 }
 
 void wxDC::SetPen(const wxPen& pen)
 {
     }
 }
 
 void wxDC::SetPen(const wxPen& pen)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
 

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldPen)
-    {
-        ::SelectObject(GetHdc(), (HPEN) m_oldPen);
-        m_oldPen = 0;
-    }
-
-    m_pen = pen;
+    if ( pen == m_pen )
+        return;

 
 

-    if (!m_pen.Ok())
+    if ( pen.Ok() )

     {
     {

-        if (m_oldPen)
-            ::SelectObject(GetHdc(), (HPEN) m_oldPen);
-        m_oldPen = 0;
-    }
+        HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
+        if ( hpen == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(pen)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldPen )
+                m_oldPen = (WXHPEN)hpen;

 
 

-    if (m_pen.Ok())
+            m_pen = pen;
+        }
+    }
+    else // invalid pen, reset the current pen

     {
     {

-        if (m_pen.GetResourceHandle())
+        if ( m_oldPen )

         {
         {

-            HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle());
-            if (!m_oldPen)
-                m_oldPen = (WXHPEN) p;
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old pen)"));
+            }
+
+            m_oldPen = 0;

         }
         }

+
+        m_pen = wxNullPen;

     }
 }
 
 void wxDC::SetBrush(const wxBrush& brush)
 {
     }
 }
 
 void wxDC::SetBrush(const wxBrush& brush)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
 

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldBrush)
-    {
-        ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
-        m_oldBrush = 0;
-    }
-
-    m_brush = brush;
-
-    if (!m_brush.Ok())
-    {
-        if (m_oldBrush)
-            ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
-        m_oldBrush = 0;
-    }
+    if ( brush == m_brush )
+        return;

 
 

-    if (m_brush.Ok())
+    if ( brush.Ok() )

     {
     {

-        // to make sure the brush is alligned with the logical coordinates
-        wxBitmap *stipple = m_brush.GetStipple();
+        // we must make sure the brush is aligned with the logical coordinates
+        // before selecting it
+        wxBitmap *stipple = brush.GetStipple();

         if ( stipple && stipple->Ok() )
         {
         if ( stipple && stipple->Ok() )
         {

-#ifdef __WIN32__
-            ::SetBrushOrgEx(GetHdc(),
-                            m_deviceOriginX % stipple->GetWidth(),
-                            m_deviceOriginY % stipple->GetHeight(),
-                            NULL);  // don't need previous brush origin
-#else
-            ::SetBrushOrg(GetHdc(),
-                            m_deviceOriginX % stipple->GetWidth(),
-                            m_deviceOriginY % stipple->GetHeight());
-#endif
+            if ( !::SetBrushOrgEx
+                    (
+                        GetHdc(),
+                        m_deviceOriginX % stipple->GetWidth(),
+                        m_deviceOriginY % stipple->GetHeight(),
+                        NULL                    // [out] previous brush origin
+                    ) )
+            {
+                wxLogLastError(_T("SetBrushOrgEx()"));
+            }

         }
 
         }
 

-        if ( m_brush.GetResourceHandle() )
+        HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
+        if ( hbrush == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(brush)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldBrush )
+                m_oldBrush = (WXHPEN)hbrush;
+
+            m_brush = brush;
+        }
+    }
+    else // invalid brush, reset the current brush
+    {
+        if ( m_oldBrush )

         {
         {

-            HBRUSH b = 0;
-            b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());
-            if (!m_oldBrush)
-                m_oldBrush = (WXHBRUSH) b;
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old brush)"));
+            }
+
+            m_oldBrush = 0;

         }
         }

+
+        m_brush = wxNullBrush;

     }
 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 {
     }
 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     m_backgroundBrush = brush;
 
 
     m_backgroundBrush = brush;
 


@@ -1407,9 +1510,7 @@ void wxDC::SetBackground(const wxBrush& brush)
 
 void wxDC::SetBackgroundMode(int mode)
 {
 
 void wxDC::SetBackgroundMode(int mode)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     m_backgroundMode = mode;
 
 
     m_backgroundMode = mode;
 


@@ -1419,9 +1520,7 @@ void wxDC::SetBackgroundMode(int mode)
 
 void wxDC::SetLogicalFunction(int function)
 {
 
 void wxDC::SetLogicalFunction(int function)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     m_logicalFunction = function;
 
 
     m_logicalFunction = function;
 


@@ -1464,8 +1563,8 @@ void wxDC::SetRop(WXHDC dc)
 
 bool wxDC::StartDoc(const wxString& WXUNUSED(message))
 {
 
 bool wxDC::StartDoc(const wxString& WXUNUSED(message))
 {

-    // We might be previewing, so return TRUE to let it continue.
-    return TRUE;
+    // We might be previewing, so return true to let it continue.
+    return true;

 }
 
 void wxDC::EndDoc()
 }
 
 void wxDC::EndDoc()


@@ -1486,9 +1585,7 @@ void wxDC::EndPage()
 
 wxCoord wxDC::GetCharHeight() const
 {
 
 wxCoord wxDC::GetCharHeight() const
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return 0;
-#endif
+    WXMICROWIN_CHECK_HDC_RET(0)

 
     TEXTMETRIC lpTextMetric;
 
 
     TEXTMETRIC lpTextMetric;
 


@@ -1499,9 +1596,7 @@ wxCoord wxDC::GetCharHeight() const
 
 wxCoord wxDC::GetCharWidth() const
 {
 
 wxCoord wxDC::GetCharWidth() const
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return 0;
-#endif
+    WXMICROWIN_CHECK_HDC_RET(0)

 
     TEXTMETRIC lpTextMetric;
 
 
     TEXTMETRIC lpTextMetric;
 


@@ -1558,11 +1653,52 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
     }
 }
 
     }
 }
 

+
+// Each element of the array will be the width of the string up to and
+// including the coresoponding character in text.
+
+bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+{
+    static int maxLenText = -1;
+    static int maxWidth = -1;
+    int fit = 0;
+    SIZE sz = {0,0};
+    int stlen = text.Length();
+
+    if (maxLenText == -1)
+    {
+        // Win9x and WinNT+ have different limits
+        int version = wxGetOsVersion();
+        maxLenText = version == wxWINDOWS_NT ? 65535 : 8192;
+        maxWidth =   version == wxWINDOWS_NT ? INT_MAX : 32767;
+    }
+
+    widths.Empty();
+    widths.Add(0, stlen);  // fill the array with zeros
+
+    if (!::GetTextExtentExPoint(GetHdc(),
+                                text.c_str(),           // string to check
+                                wxMin(stlen, maxLenText),
+                                maxWidth,
+                                &fit,                   // [out] count of chars
+                                                        // that will fit
+                                &widths[0],             // array to fill
+                                &sz))
+    {
+        // API failed
+        wxLogLastError(wxT("GetTextExtentExPoint"));
+        return false;
+    }
+
+    return true;
+}
+
+
+
+

 void wxDC::SetMapMode(int mode)
 {
 void wxDC::SetMapMode(int mode)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     m_mappingMode = mode;
 
 
     m_mappingMode = mode;
 


@@ -1617,6 +1753,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,


@@ -1627,13 +1764,12 @@ 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)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

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


@@ -1641,15 +1777,14 @@ void wxDC::SetUserScale(double x, double y)
     m_userScaleX = x;
     m_userScaleY = y;
 
     m_userScaleX = x;
     m_userScaleY = y;
 

-    SetMapMode(m_mappingMode);
+    this->SetMapMode(m_mappingMode);

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

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
 

+#ifndef __WXWINCE__

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


@@ -1660,13 +1795,15 @@ void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
 
         SetMapMode(m_mappingMode);
     }
 
         SetMapMode(m_mappingMode);
     }

+#else
+    wxUnusedVar(xLeftRight);
+    wxUnusedVar(yBottomUp);
+#endif

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

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

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


@@ -1674,14 +1811,14 @@ void wxDC::SetSystemScale(double x, double y)
     m_scaleX = x;
     m_scaleY = y;
 
     m_scaleX = x;
     m_scaleY = y;
 

+#ifndef __WXWINCE__

     SetMapMode(m_mappingMode);
     SetMapMode(m_mappingMode);

+#endif

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

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

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


@@ -1689,14 +1826,14 @@ void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
     m_logicalOriginX = x;
     m_logicalOriginY = y;
 
     m_logicalOriginX = x;
     m_logicalOriginY = y;
 

+#ifndef __WXWINCE__

     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);

+#endif

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

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

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


@@ -1765,18 +1902,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                   int rop, bool useMask,
                   wxCoord xsrcMask, wxCoord ysrcMask)
 {
                   int rop, bool useMask,
                   wxCoord xsrcMask, wxCoord ysrcMask)
 {

-    wxCHECK_MSG( source, FALSE, _T("wxDC::Blit(): NULL wxDC pointer") );
+    wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );

 
 

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return FALSE;
-#endif
+    WXMICROWIN_CHECK_HDC_RET(false)

 
 

+    // if either the source or destination has alpha channel, we must use
+    // AlphaBlt() as other function don't handle it correctly

     const wxBitmap& bmpSrc = source->m_selectedBitmap;
     const wxBitmap& bmpSrc = source->m_selectedBitmap;

-    if ( bmpSrc.Ok() && bmpSrc.HasAlpha() )
+    if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() ||
+            (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) )

     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
                       GetHdcOf(*source), bmpSrc) )
     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
                       GetHdcOf(*source), bmpSrc) )

-            return TRUE;
+            return true;

     }
 
     wxMask *mask = NULL;
     }
 
     wxMask *mask = NULL;


@@ -1788,7 +1926,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter

-            useMask = FALSE;
+            useMask = false;

         }
     }
 
         }
     }
 


@@ -1808,7 +1946,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 

-    DWORD dwRop = SRCCOPY;
+    DWORD dwRop;

     switch (rop)
     {
         case wxXOR:          dwRop = SRCINVERT;        break;
     switch (rop)
     {
         case wxXOR:          dwRop = SRCINVERT;        break;


@@ -1829,10 +1967,10 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );
         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );

-           return FALSE;
+           return false;

     }
 
     }
 

-    bool success = FALSE;
+    bool success = false;

 
     if (useMask)
     {
 
     if (useMask)
     {


@@ -1843,7 +1981,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         // of the mask which is also contrary to the Windows one)
 
         // On some systems, MaskBlt succeeds yet is much much slower
         // of the mask which is also contrary to the Windows one)
 
         // On some systems, MaskBlt succeeds yet is much much slower

-        // than the wxWindows fall-back implementation. So we need
+        // than the wxWidgets fall-back implementation. So we need

         // to be able to switch this on and off at runtime.
 #if wxUSE_SYSTEM_OPTIONS
         if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
         // to be able to switch this on and off at runtime.
 #if wxUSE_SYSTEM_OPTIONS
         if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)


@@ -1950,6 +2088,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) )
         {


@@ -1962,10 +2103,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             {
                 StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
 
             {
                 StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
 

+                // Figure out what co-ordinate system we're supposed to specify
+                // ysrc in.
+                const LONG hDIB = ds.dsBmih.biHeight;
+                if ( hDIB > 0 )
+                {
+                    // reflect ysrc
+                    ysrc = hDIB - (ysrc + height);
+                }
+

                 if ( ::StretchDIBits(GetHdc(),
                                      xdest, ydest,
                                      width, height,
                 if ( ::StretchDIBits(GetHdc(),
                                      xdest, ydest,
                                      width, height,

-                                     0, 0,
+                                     xsrc, ysrc,

                                      width, height,
                                      ds.dsBm.bmBits,
                                      (LPBITMAPINFO)&ds.dsBmih,
                                      width, height,
                                      ds.dsBm.bmBits,
                                      (LPBITMAPINFO)&ds.dsBmih,


@@ -1973,18 +2123,26 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                                      SRCCOPY
                                      ) == (int)GDI_ERROR )
                 {
                                      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
                 {
                 }
                 else
                 {

-                    success = TRUE;
+                    success = true;

                 }
             }
         }
 
         if ( !success && (caps & RC_STRETCHBLT) )
                 }
             }
         }
 
         if ( !success && (caps & RC_STRETCHBLT) )

+#endif
+        // __WXWINCE__

         {
         {

+#ifndef __WXWINCE__

             StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
             StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);

+#endif

 
             if ( !::StretchBlt
                     (
 
             if ( !::StretchBlt
                     (


@@ -1999,7 +2157,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             }
             else
             {
             }
             else
             {

-                success = TRUE;
+                success = true;

             }
         }
 
             }
         }
 


@@ -2019,7 +2177,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             }
             else
             {
             }
             else
             {

-                success = TRUE;
+                success = true;

             }
         }
     }
             }
         }
     }


@@ -2032,9 +2190,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
 
 void wxDC::DoGetSize(int *w, int *h) const
 {
 
 void wxDC::DoGetSize(int *w, int *h) const
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
     if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);
 
     if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
     if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);


@@ -2042,9 +2198,7 @@ void wxDC::DoGetSize(int *w, int *h) const
 
 void wxDC::DoGetSizeMM(int *w, int *h) const
 {
 
 void wxDC::DoGetSizeMM(int *w, int *h) const
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     // if we implement it in terms of DoGetSize() instead of directly using the
     // results returned by GetDeviceCaps(HORZ/VERTSIZE) as was done before, it
 
     // if we implement it in terms of DoGetSize() instead of directly using the
     // results returned by GetDeviceCaps(HORZ/VERTSIZE) as was done before, it


@@ -2074,9 +2228,7 @@ void wxDC::DoGetSizeMM(int *w, int *h) const
 
 wxSize wxDC::GetPPI() const
 {
 
 wxSize wxDC::GetPPI() const
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return wxSize();
-#endif
+    WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))

 
     int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
     int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);
 
     int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
     int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);


@@ -2084,12 +2236,10 @@ wxSize wxDC::GetPPI() const
     return wxSize(x, y);
 }
 
     return wxSize(x, y);
 }
 

-// For use by wxWindows only, unless custom units are required.
+// For use by wxWidgets only, unless custom units are required.

 void wxDC::SetLogicalScale(double x, double y)
 {
 void wxDC::SetLogicalScale(double x, double y)
 {

-#ifdef __WXMICROWIN__
-    if (!GetHDC()) return;
-#endif
+    WXMICROWIN_CHECK_HDC

 
     m_logicalScaleX = x;
     m_logicalScaleY = y;
 
     m_logicalScaleX = x;
     m_logicalScaleY = y;


@@ -2139,7 +2289,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();


@@ -2175,7 +2325,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();


@@ -2213,19 +2363,15 @@ 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
 class wxDCModule : public wxModule
 {
 public:
 }
 
 // Clean up cache at app exit
 class wxDCModule : public wxModule
 {
 public:

-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }

     virtual void OnExit() { wxDC::ClearCache(); }
 
 private:
     virtual void OnExit() { wxDC::ClearCache(); }
 
 private:


@@ -2257,11 +2403,11 @@ static bool AlphaBlt(HDC hdcDst,
 
     // bitmaps can be drawn only from GUI thread so there is no need to
     // protect this static variable from multiple threads
 
     // bitmaps can be drawn only from GUI thread so there is no need to
     // protect this static variable from multiple threads

-    static bool s_triedToLoad = FALSE;
+    static bool s_triedToLoad = false;

     static AlphaBlend_t pfnAlphaBlend = NULL;
     if ( !s_triedToLoad )
     {
     static AlphaBlend_t pfnAlphaBlend = NULL;
     if ( !s_triedToLoad )
     {

-        s_triedToLoad = TRUE;
+        s_triedToLoad = true;

 
         // don't give errors about the DLL being unavailable, we're
         // prepared to handle this
 
         // don't give errors about the DLL being unavailable, we're
         // prepared to handle this


@@ -2294,7 +2440,7 @@ static bool AlphaBlt(HDC hdcDst,
                            bf) )
         {
             // skip wxAlphaBlend() call below
                            bf) )
         {
             // skip wxAlphaBlend() call below

-            return TRUE;
+            return true;

         }
 
         wxLogLastError(_T("AlphaBlend"));
         }
 
         wxLogLastError(_T("AlphaBlend"));


@@ -2306,11 +2452,12 @@ static bool AlphaBlt(HDC hdcDst,
 #ifdef wxHAVE_RAW_BITMAP
     wxAlphaBlend(hdcDst, x, y, width, height, bmp);
 
 #ifdef wxHAVE_RAW_BITMAP
     wxAlphaBlend(hdcDst, x, y, width, height, bmp);
 

-    return TRUE;
+    return true;

 #else // !wxHAVE_RAW_BITMAP
     // no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
     // alpha but at least something will be shown like this)
 #else // !wxHAVE_RAW_BITMAP
     // no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
     // alpha but at least something will be shown like this)

-    return FALSE;
+    wxUnusedVar(bmp);
+    return false;

 #endif // wxHAVE_RAW_BITMAP
 }
 
 #endif // wxHAVE_RAW_BITMAP
 }