Compilo after wxVideoMode change, MSW part

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index b3bc3fcc166600a1ea8724443a0f6d5a3bb34569..1db02a2c5733603c8ba8be74a52a0b44db1750ce 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -28,7 +28,6 @@
     #include "wx/msw/wrapcdlg.h"
     #include "wx/image.h"
     #include "wx/window.h"
     #include "wx/msw/wrapcdlg.h"
     #include "wx/image.h"
     #include "wx/window.h"

-    #include "wx/dc.h"

     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"


@@ -40,6 +39,7 @@
     #include "wx/module.h"
 #endif
 
     #include "wx/module.h"
 #endif
 

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

 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 
 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 


@@ -84,9 +84,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl)
 
 static const int VIEWPORT_EXTENT = 1000;
 
 
 static const int VIEWPORT_EXTENT = 1000;
 

-static const int MM_POINTS = 9;
-static const int MM_METRIC = 10;
-

 // 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


@@ -282,7 +279,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGDIDLLsCleanupModule, wxModule)
 wxColourChanger::wxColourChanger(wxMSWDCImpl& dc) : m_dc(dc)
 {
     const wxBrush& brush = dc.GetBrush();
 wxColourChanger::wxColourChanger(wxMSWDCImpl& dc) : m_dc(dc)
 {
     const wxBrush& brush = dc.GetBrush();

-    if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+    if ( brush.IsOk() && brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE )

     {
         HDC hdc = GetHdcOf(dc);
         m_colFgOld = ::GetTextColor(hdc);
     {
         HDC hdc = GetHdcOf(dc);
         m_colFgOld = ::GetTextColor(hdc);


@@ -291,20 +288,20 @@ wxColourChanger::wxColourChanger(wxMSWDCImpl& dc) : m_dc(dc)
         // 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();
         // 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() )
+        if ( colFg.IsOk() )

         {
             ::SetBkColor(hdc, colFg.GetPixel());
         }
 
         const wxColour& colBg = dc.GetTextBackground();
         {
             ::SetBkColor(hdc, colFg.GetPixel());
         }
 
         const wxColour& colBg = dc.GetTextBackground();

-        if ( colBg.Ok() )
+        if ( colBg.IsOk() )

         {
             ::SetTextColor(hdc, colBg.GetPixel());
         }
 
         SetBkMode(hdc,
         {
             ::SetTextColor(hdc, colBg.GetPixel());
         }
 
         SetBkMode(hdc,

-                  dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
-                                                          : OPAQUE);
+                  dc.GetBackgroundMode() == wxBRUSHSTYLE_TRANSPARENT
+                                                  ? TRANSPARENT : OPAQUE);

 
         // flag which telsl us to undo changes in the dtor
         m_changed = true;
 
         // flag which telsl us to undo changes in the dtor
         m_changed = true;


@@ -378,7 +375,7 @@ void wxMSWDCImpl::SelectOldObjects(WXHDC dc)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
 #ifdef __WXDEBUG__
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
 #ifdef __WXDEBUG__

-            if (m_selectedBitmap.Ok())
+            if (m_selectedBitmap.IsOk())

             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }
             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }


@@ -601,8 +598,8 @@ void wxMSWDCImpl::Clear()
     {
         // No, I think we should simply ignore this if printing on e.g.
         // a printer DC.
     {
         // No, I think we should simply ignore this if printing on e.g.
         // a printer DC.

-        // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
-        if (!m_selectedBitmap.Ok())
+        // wxCHECK_RET( m_selectedBitmap.IsOk(), wxT("this DC can't be cleared") );
+        if (!m_selectedBitmap.IsOk())

             return;
 
         rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
             return;
 
         rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;


@@ -743,7 +740,7 @@ void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
     wxCoord xxx2 = (wxCoord) (xxc+ray);
     wxCoord yyy2 = (wxCoord) (yyc+ray);
 
     wxCoord xxx2 = (wxCoord) (xxc+ray);
     wxCoord yyy2 = (wxCoord) (yyc+ray);
 

-    if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )
+    if ( m_brush.IsOk() && m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )

     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).
     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).


@@ -779,7 +776,7 @@ void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     rect.bottom = y2;
 
 #ifdef __WXWINCE__
     rect.bottom = y2;
 
 #ifdef __WXWINCE__

-    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK);
+    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_CHECKED);

 #else
     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
 #endif
 #else
     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
 #endif


@@ -794,7 +791,7 @@ void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
     WXMICROWIN_CHECK_HDC
 
     COLORREF color = 0x00ffffff;
     WXMICROWIN_CHECK_HDC
 
     COLORREF color = 0x00ffffff;

-    if (m_pen.Ok())
+    if (m_pen.IsOk())

     {
         color = m_pen.GetColour().GetPixel();
     }
     {
         color = m_pen.GetColour().GetPixel();
     }


@@ -860,7 +857,7 @@ wxMSWDCImpl::DoDrawPolyPolygon(int n,
                         int fillStyle)
 {
 #ifdef __WXWINCE__
                         int fillStyle)
 {
 #ifdef __WXWINCE__

-    wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
+    wxDCImpl::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);

 #else
     WXMICROWIN_CHECK_HDC
 
 #else
     WXMICROWIN_CHECK_HDC
 


@@ -951,7 +948,7 @@ void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
     // (i.e. drawn with a transparent pen) one pixel smaller in both directions
     // and we want them to have the same size regardless of which pen is used
 #ifndef __WXWINCE__
     // (i.e. drawn with a transparent pen) one pixel smaller in both directions
     // and we want them to have the same size regardless of which pen is used
 #ifndef __WXWINCE__

-    if ( m_pen.GetStyle() == wxTRANSPARENT )
+    if ( m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )

     {
         x2dev++;
         y2dev++;
     {
         x2dev++;
         y2dev++;


@@ -985,7 +982,7 @@ void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx
     // Windows draws the filled rectangles without outline (i.e. drawn with a
     // transparent pen) one pixel smaller in both directions and we want them
     // to have the same size regardless of which pen is used - adjust
     // Windows draws the filled rectangles without outline (i.e. drawn with a
     // transparent pen) one pixel smaller in both directions and we want them
     // to have the same size regardless of which pen is used - adjust

-    if ( m_pen.GetStyle() == wxTRANSPARENT )
+    if ( m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )

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


@@ -1018,7 +1015,7 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
 {
 #ifdef  __WXWINCE__
     // WinCE does not support ::PolyBezier so use generic version
 {
 #ifdef  __WXWINCE__
     // WinCE does not support ::PolyBezier so use generic version

-    wxDCBase::DoDrawSpline(points);
+    wxDCImpl::DoDrawSpline(points);

 #else
     // quadratic b-spline to cubic bezier spline conversion
     //
 #else
     // quadratic b-spline to cubic bezier spline conversion
     //


@@ -1141,13 +1138,13 @@ void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
 
     // Swap start and end positions if the end angle is less than the start angle.
     if (ea < sa) {
 
     // Swap start and end positions if the end angle is less than the start angle.
     if (ea < sa) {

-       int temp;
-       temp = rx2;
-       rx2 = rx1;
-       rx1 = temp;
-       temp = ry2;
-       ry2 = ry1;
-       ry1 = temp;
+        int temp;
+        temp = rx2;
+        rx2 = rx1;
+        rx1 = temp;
+        temp = ry2;
+        ry2 = ry1;
+        ry1 = temp;

     }
 
     // draw pie with NULL_PEN first and then outline otherwise a line is
     }
 
     // draw pie with NULL_PEN first and then outline otherwise a line is


@@ -1178,7 +1175,7 @@ void wxMSWDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

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

 
 #ifdef __WIN32__
     ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
 
 #ifdef __WIN32__
     ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);


@@ -1194,7 +1191,7 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxMSWDCImpl::DrawBitmap") );
+    wxCHECK_RET( bmp.IsOk(), _T("invalid bitmap in wxMSWDCImpl::DrawBitmap") );

 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();


@@ -1290,11 +1287,11 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 
         COLORREF old_textground = ::GetTextColor(GetHdc());
         COLORREF old_background = ::GetBkColor(GetHdc());
 
         COLORREF old_textground = ::GetTextColor(GetHdc());
         COLORREF old_background = ::GetBkColor(GetHdc());

-        if (m_textForegroundColour.Ok())
+        if (m_textForegroundColour.IsOk())

         {
             ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
         }
         {
             ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
         }

-        if (m_textBackgroundColour.Ok())
+        if (m_textBackgroundColour.IsOk())

         {
             ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
         }
         {
             ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
         }


@@ -1343,16 +1340,16 @@ void wxMSWDCImpl::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
     WXMICROWIN_CHECK_HDC
 
     // prepare for drawing the text
     WXMICROWIN_CHECK_HDC
 
     // prepare for drawing the text

-    if ( m_textForegroundColour.Ok() )
+    if ( m_textForegroundColour.IsOk() )

         SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
 
     DWORD old_background = 0;
         SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
 
     DWORD old_background = 0;

-    if ( m_textBackgroundColour.Ok() )
+    if ( m_textBackgroundColour.IsOk() )

     {
         old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 
     {
         old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 

-    SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
+    SetBkMode(GetHdc(), m_backgroundMode == wxBRUSHSTYLE_TRANSPARENT ? TRANSPARENT

                                                           : OPAQUE);
 
 #ifdef __WXWINCE__
                                                           : OPAQUE);
 
 #ifdef __WXWINCE__


@@ -1372,7 +1369,7 @@ void wxMSWDCImpl::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
     // restore the old parameters (text foreground colour may be left because
     // it never is set to anything else, but background should remain
     // transparent even if we just drew an opaque string)
     // restore the old parameters (text foreground colour may be left because
     // it never is set to anything else, but background should remain
     // transparent even if we just drew an opaque string)

-    if ( m_textBackgroundColour.Ok() )
+    if ( m_textBackgroundColour.IsOk() )

         (void)SetBkColor(GetHdc(), old_background);
 
     SetBkMode(GetHdc(), TRANSPARENT);
         (void)SetBkColor(GetHdc(), old_background);
 
     SetBkMode(GetHdc(), TRANSPARENT);


@@ -1388,7 +1385,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
     // "else" part below to avoid that DrawRotatedText(angle = 180) and
     // DrawRotatedText(angle = 0) use different fonts (we can't use the default
     // font for drawing rotated fonts unfortunately)
     // "else" part below to avoid that DrawRotatedText(angle = 180) and
     // DrawRotatedText(angle = 0) use different fonts (we can't use the default
     // font for drawing rotated fonts unfortunately)

-    if ( (angle == 0.0) && m_font.Ok() )
+    if ( (angle == 0.0) && m_font.IsOk() )

     {
         DoDrawText(text, x, y);
     }
     {
         DoDrawText(text, x, y);
     }


@@ -1398,7 +1395,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
         // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT)
         //     because it's not TrueType and so can't have non zero
         //     orientation/escapement under Win9x
         // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT)
         //     because it's not TrueType and so can't have non zero
         //     orientation/escapement under Win9x

-        wxFont font = m_font.Ok() ? m_font : *wxSWISS_FONT;
+        wxFont font = m_font.IsOk() ? m_font : *wxSWISS_FONT;

         HFONT hfont = (HFONT)font.GetResourceHandle();
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
         HFONT hfont = (HFONT)font.GetResourceHandle();
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )


@@ -1465,7 +1462,7 @@ void wxMSWDCImpl::DoSelectPalette(bool realize)
         m_oldPalette = 0;
     }
 
         m_oldPalette = 0;
     }
 

-    if ( m_palette.Ok() )
+    if ( m_palette.IsOk() )

     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),


@@ -1480,7 +1477,7 @@ void wxMSWDCImpl::DoSelectPalette(bool realize)
 
 void wxMSWDCImpl::SetPalette(const wxPalette& palette)
 {
 
 void wxMSWDCImpl::SetPalette(const wxPalette& palette)
 {

-    if ( palette.Ok() )
+    if ( palette.IsOk() )

     {
         m_palette = palette;
         DoSelectPalette(true);
     {
         m_palette = palette;
         DoSelectPalette(true);


@@ -1518,7 +1515,7 @@ void wxMSWDCImpl::SetFont(const wxFont& font)
     if ( font == m_font )
         return;
 
     if ( font == m_font )
         return;
 

-    if ( font.Ok() )
+    if ( font.IsOk() )

     {
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )
     {
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )


@@ -1556,7 +1553,7 @@ void wxMSWDCImpl::SetPen(const wxPen& pen)
     if ( pen == m_pen )
         return;
 
     if ( pen == m_pen )
         return;
 

-    if ( pen.Ok() )
+    if ( pen.IsOk() )

     {
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )
     {
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )


@@ -1594,12 +1591,12 @@ void wxMSWDCImpl::SetBrush(const wxBrush& brush)
     if ( brush == m_brush )
         return;
 
     if ( brush == m_brush )
         return;
 

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

     {
         // we must make sure the brush is aligned with the logical coordinates
         // before selecting it
         wxBitmap *stipple = 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->IsOk() )

         {
             if ( !::SetBrushOrgEx
                     (
         {
             if ( !::SetBrushOrgEx
                     (


@@ -1648,7 +1645,7 @@ void wxMSWDCImpl::SetBackground(const wxBrush& brush)
 
     m_backgroundBrush = brush;
 
 
     m_backgroundBrush = brush;
 

-    if ( m_backgroundBrush.Ok() )
+    if ( m_backgroundBrush.IsOk() )

     {
         (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
     }
     {
         (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
     }


@@ -1769,7 +1766,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
     HFONT hfontOld;
     if ( font )
     {
     HFONT hfontOld;
     if ( font )
     {

-        wxASSERT_MSG( font->Ok(), _T("invalid font in wxMSWDCImpl::GetTextExtent") );
+        wxASSERT_MSG( font->IsOk(), _T("invalid font in wxMSWDCImpl::GetTextExtent") );

 
         hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
     }
 
         hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
     }


@@ -1890,7 +1887,6 @@ void wxMSWDCImpl::RealizeScaleAndOrigin()
     ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
 #endif
     ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
 #endif

-

 }
 
 void wxMSWDCImpl::SetMapMode(int mode)
 }
 
 void wxMSWDCImpl::SetMapMode(int mode)


@@ -2032,23 +2028,23 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
     WXMICROWIN_CHECK_HDC_RET(false)
 
 
     WXMICROWIN_CHECK_HDC_RET(false)
 

-    wxDCImpl *impl = source->GetImpl();
-    wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
-    if (!msw_impl)
+    wxMSWDCImpl *implSrc = wxDynamicCast( source->GetImpl(), wxMSWDCImpl );
+    if ( !implSrc )

     {
     {

-        // TODO: Do we want to be able to blit
-        //       from other DCs too?
+        // TODO: Do we want to be able to blit from other DCs too?

         return false;
     }
 
         return false;
     }
 

+    const HDC hdcSrc = GetHdcOf(*implSrc);
+

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

-    const wxBitmap& bmpSrc = msw_impl->GetSelectedBitmap();
-    if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() ||
-            (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) )
+    const wxBitmap& bmpSrc = implSrc->GetSelectedBitmap();
+    if ( bmpSrc.IsOk() && (bmpSrc.HasAlpha() ||
+            (m_selectedBitmap.IsOk() && m_selectedBitmap.HasAlpha())) )

     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,

-                      xsrc, ysrc, srcWidth, srcHeight, GetHdcOf(*msw_impl), bmpSrc) )
+                      xsrc, ysrc, srcWidth, srcHeight, hdcSrc, bmpSrc) )

             return true;
     }
 
             return true;
     }
 


@@ -2057,7 +2053,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
     {
         mask = bmpSrc.GetMask();
 
     {
         mask = bmpSrc.GetMask();
 

-        if ( !(bmpSrc.Ok() && mask && mask->GetMaskBitmap()) )
+        if ( !(bmpSrc.IsOk() && mask && mask->GetMaskBitmap()) )

         {
             // 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


@@ -2072,11 +2068,11 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());
 
     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());

-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())

     {
         ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
     }
     {
         ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
     }

-    if (m_textBackgroundColour.Ok())
+    if (m_textBackgroundColour.IsOk())

     {
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
     {
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }


@@ -2128,7 +2124,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                             (
                             GetHdc(),
                             xdest, ydest, dstWidth, dstHeight,
                             (
                             GetHdc(),
                             xdest, ydest, dstWidth, dstHeight,

-                            GetHdcOf(*msw_impl),
+                            hdcSrc,

                             xsrc, ysrc,
                             (HBITMAP)mask->GetMaskBitmap(),
                             xsrcMask, ysrcMask,
                             xsrc, ysrc,
                             (HBITMAP)mask->GetMaskBitmap(),
                             xsrcMask, ysrcMask,


@@ -2147,7 +2143,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
 #if wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask
 
 #if wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask

-            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, msw_impl->GetHDC());
+            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, hdcSrc);

             dc_mask = (HDC) dcCacheEntry1->m_dc;
 
             wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());
             dc_mask = (HDC) dcCacheEntry1->m_dc;
 
             wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());


@@ -2159,7 +2155,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
             buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
 #else // !wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask
             buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
 #else // !wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask

-            dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+            dc_mask = ::CreateCompatibleDC(hdcSrc);

             dc_buffer = ::CreateCompatibleDC(GetHdc());
             buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
 #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
             dc_buffer = ::CreateCompatibleDC(GetHdc());
             buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
 #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING


@@ -2179,7 +2175,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
             // copy src to buffer using selected raster op
             if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
 
             // copy src to buffer using selected raster op
             if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,

-                           GetHdcOf(*msw_impl), xsrc, ysrc, srcWidth, srcHeight, dwRop) )
+                               hdcSrc, xsrc, ysrc, srcWidth, srcHeight, dwRop) )

             {
                 wxLogLastError(wxT("StretchBlt"));
             }
             {
                 wxLogLastError(wxT("StretchBlt"));
             }


@@ -2234,7 +2230,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         // FIXME: use appropriate WinCE functions
 #ifndef __WXWINCE__
         const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);
         // FIXME: use appropriate WinCE functions
 #ifndef __WXWINCE__
         const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);

-        if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) )
+        if ( bmpSrc.IsOk() && (caps & RC_STRETCHDIB) )

         {
             DIBSECTION ds;
             wxZeroMemory(ds);
         {
             DIBSECTION ds;
             wxZeroMemory(ds);


@@ -2290,7 +2286,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                     (
                         GetHdc(),
                         xdest, ydest, dstWidth, dstHeight,
                     (
                         GetHdc(),
                         xdest, ydest, dstWidth, dstHeight,

-                        GetHdcOf(*msw_impl),
+                        hdcSrc,

                         xsrc, ysrc, srcWidth, srcHeight,
                         dwRop
                     ) )
                         xsrc, ysrc, srcWidth, srcHeight,
                         dwRop
                     ) )


@@ -2310,7 +2306,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                         GetHdc(),
                         xdest, ydest,
                         (int)dstWidth, (int)dstHeight,
                         GetHdc(),
                         xdest, ydest,
                         (int)dstWidth, (int)dstHeight,

-                        GetHdcOf(*msw_impl),
+                        hdcSrc,

                         xsrc, ysrc,
                         dwRop
                     ) )
                         xsrc, ysrc,
                         dwRop
                     ) )


@@ -2536,7 +2532,7 @@ static bool AlphaBlt(HDC hdcDst,
                      HDC hdcSrc,
                      const wxBitmap& bmp)
 {
                      HDC hdcSrc,
                      const wxBitmap& bmp)
 {

-    wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
+    wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );

     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?