Small testing changes,

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index a7b088cb0e630c4f42b12766eea485f893e8104c..f339b4dafe12aab7a8b210d7885d80808b4a8c42 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -45,6 +45,8 @@
 #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
     #include <commdlg.h>
 #endif
 #if wxUSE_COMMON_DIALOGS
     #include <commdlg.h>
 #endif


@@ -53,11 +55,7 @@
     #include <print.h>
 #endif
 
     #include <print.h>
 #endif
 

-#include "wx/msw/private.h"
-
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

 
 // ---------------------------------------------------------------------------
 // constants
 
 // ---------------------------------------------------------------------------
 // constants


@@ -68,57 +66,21 @@ 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;
 

-// ---------------------------------------------------------------------------
-// macros
-// ---------------------------------------------------------------------------
-
-// Logical to device
-// Absolute
-#define XLOG2DEV(x) (x)
-#define YLOG2DEV(y) (y)
-
-// Relative
-#define XLOG2DEVREL(x) (x)
-#define YLOG2DEVREL(y) (y)
-
-// Device to logical
-// Absolute
-#define XDEV2LOG(x) (x)
-
-#define YDEV2LOG(y) (y)
-
-// Relative
-#define XDEV2LOGREL(x) (x)
-#define YDEV2LOGREL(y) (y)
-
-/*
- * Have the same macros as for XView but not for every operation:
- * just for calculating window/viewport extent (a better way of scaling).
- */
+// usually this is defined in math.h
+#ifndef M_PI
+    static const double M_PI = 3.14159265358979323846;
+#endif // M_PI

 
 

-// Logical to device
-// Absolute
-#define MS_XLOG2DEV(x) LogicalToDevice(x)
+// 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

 
 

-#define MS_YLOG2DEV(y) LogicalToDevice(y)
-
-// Relative
-#define MS_XLOG2DEVREL(x) LogicalToDeviceXRel(x)
-#define MS_YLOG2DEVREL(y) LogicalToDeviceYRel(y)
-
-// Device to logical
-// Absolute
-#define MS_XDEV2LOG(x) DeviceToLogicalX(x)
-
-#define MS_YDEV2LOG(y) DeviceToLogicalY(y)
-
-// Relative
-#define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
-#define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
-
-#define YSCALE(y) (yorigin - (y))
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------

 
 

-#define     wx_round(a)    (int)((a)+.5)
+// convert degrees to radians
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -213,7 +175,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
 // clipping
 // ---------------------------------------------------------------------------
 
 // clipping
 // ---------------------------------------------------------------------------
 

-void wxDC::DoSetClippingRegion(long cx, long cy, long cw, long ch)
+void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)

 {
     m_clipping = TRUE;
     m_clipX1 = (int)cx;
 {
     m_clipping = TRUE;
     m_clipX1 = (int)cx;


@@ -226,7 +188,7 @@ void wxDC::DoSetClippingRegion(long cx, long cy, long cw, long ch)
 
 void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {
 
 void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {

-    wxCHECK_RET( region.GetHRGN(), _T("invalid clipping region") );
+    wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );

 
     wxRect box = region.GetBox();
 
 
     wxRect box = region.GetBox();
 


@@ -295,14 +257,23 @@ int wxDC::GetDepth() const
 void wxDC::Clear()
 {
     RECT rect;
 void wxDC::Clear()
 {
     RECT rect;

-    if (m_canvas)
+    if ( m_canvas )
+    {

         GetClientRect((HWND) m_canvas->GetHWND(), &rect);
         GetClientRect((HWND) m_canvas->GetHWND(), &rect);

-    else if (m_selectedBitmap.Ok())
+    }
+    else

     {
     {

+        // 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())
+            return;
+

         rect.left = 0; rect.top = 0;
         rect.right = m_selectedBitmap.GetWidth();
         rect.bottom = m_selectedBitmap.GetHeight();
     }
         rect.left = 0; rect.top = 0;
         rect.right = m_selectedBitmap.GetWidth();
         rect.bottom = m_selectedBitmap.GetHeight();
     }

+

     (void) ::SetMapMode(GetHdc(), MM_TEXT);
 
     DWORD colour = GetBkColor(GetHdc());
     (void) ::SetMapMode(GetHdc(), MM_TEXT);
 
     DWORD colour = GetBkColor(GetHdc());


@@ -317,25 +288,36 @@ void wxDC::Clear()
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
 }
 
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
 }
 

-void wxDC::DoFloodFill(long x, long y, const wxColour& col, int style)
+void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)

 {
 {

-    (void)ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
-                       col.GetPixel(),
-                       style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
-                                                : FLOODFILLBORDER);
+    if ( !::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                         col.GetPixel(),
+                         style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
+                                                  : FLOODFILLBORDER) )
+    {
+        // quoting from the MSDN docs:
+        //
+        //      Following are some of the reasons this function might fail:
+        //
+        //      * The filling could not be completed.
+        //      * The specified point has the boundary color specified by the
+        //        crColor parameter (if FLOODFILLBORDER was requested).
+        //      * The specified point does not have the color specified by
+        //        crColor (if FLOODFILLSURFACE was requested)
+        //      * The point is outside the clipping region that is, it is not
+        //        visible on the device.
+        //
+        wxLogLastError("ExtFloodFill");
+    }

 
     CalcBoundingBox(x, y);
 }
 
 
     CalcBoundingBox(x, y);
 }
 

-bool wxDC::DoGetPixel(long x, long y, wxColour *col) const
+bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const

 {
 {

-    // added by steve 29.12.94 (copied from DrawPoint)
-    // returns TRUE for pixels in the color of the current pen
-    // and FALSE for all other pixels colors
-    // if col is non-NULL return the color of the pixel
-

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

+

     // get the color of the pen
     COLORREF pencolor = 0x00ffffff;
     if (m_pen.Ok())
     // get the color of the pen
     COLORREF pencolor = 0x00ffffff;
     if (m_pen.Ok())


@@ -344,20 +326,24 @@ bool wxDC::DoGetPixel(long x, long y, wxColour *col) const
     }
 
     // return the color of the pixel
     }
 
     // return the color of the pixel

-    if(col)
-        col->Set(GetRValue(pixelcolor),GetGValue(pixelcolor),GetBValue(pixelcolor));
+    if( col )
+    {
+        col->Set(GetRValue(pixelcolor),
+                 GetGValue(pixelcolor),
+                 GetBValue(pixelcolor));
+    }

 
 

-    // check, if color of the pixels is the same as the color
-    // of the current pen
-    return(pixelcolor==pencolor);
+    // check, if color of the pixels is the same as the color of the current
+    // pen and return TRUE if it is, FALSE otherwise
+    return pixelcolor == pencolor;

 }
 
 }
 

-void wxDC::DoCrossHair(long x, long y)
+void wxDC::DoCrossHair(wxCoord x, wxCoord y)

 {
 {

-    long x1 = x-VIEWPORT_EXTENT;
-    long y1 = y-VIEWPORT_EXTENT;
-    long x2 = x+VIEWPORT_EXTENT;
-    long 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(x1), YLOG2DEV(y), NULL);
     (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y));


@@ -369,44 +355,42 @@ void wxDC::DoCrossHair(long x, long y)
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DoDrawLine(long x1, long y1, long x2, long y2)
+void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
     (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
     (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
 
 {
     (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
     (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
 

-    /* MATTHEW: [6] New normalization */
-#if WX_STANDARD_GRAPHICS
+    // Normalization: Windows doesn't draw the last point of the line

     (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
     (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));

-#endif

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

-void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
+void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wxCoord yc)

 {
     double dx = xc-x1;
     double dy = yc-y1;
     double radius = (double)sqrt(dx*dx+dy*dy) ;;
     if (x1==x2 && x2==y2)
     {
 {
     double dx = xc-x1;
     double dy = yc-y1;
     double radius = (double)sqrt(dx*dx+dy*dy) ;;
     if (x1==x2 && x2==y2)
     {

-        DrawEllipse(xc,yc,(long)(radius*2.0),(long)(radius*2.0));
+        DrawEllipse(xc,yc,(wxCoord)(radius*2.0),(wxCoord)(radius*2.0));

         return;
     }
 
         return;
     }
 

-    long xx1 = XLOG2DEV(x1);
-    long yy1 = YLOG2DEV(y1);
-    long xx2 = XLOG2DEV(x2);
-    long yy2 = YLOG2DEV(y2);
-    long xxc = XLOG2DEV(xc);
-    long yyc = YLOG2DEV(yc);
-    long ray = (long) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1)));
+    wxCoord xx1 = XLOG2DEV(x1);
+    wxCoord yy1 = YLOG2DEV(y1);
+    wxCoord xx2 = XLOG2DEV(x2);
+    wxCoord yy2 = YLOG2DEV(y2);
+    wxCoord xxc = XLOG2DEV(xc);
+    wxCoord yyc = YLOG2DEV(yc);
+    wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1)));

 
     (void)MoveToEx(GetHdc(), (int) xx1, (int) yy1, NULL);
 
     (void)MoveToEx(GetHdc(), (int) xx1, (int) yy1, NULL);

-    long xxx1 = (long) (xxc-ray);
-    long yyy1 = (long) (yyc-ray);
-    long xxx2 = (long) (xxc+ray);
-    long yyy2 = (long) (yyc+ray);
+    wxCoord xxx1 = (wxCoord) (xxc-ray);
+    wxCoord yyy1 = (wxCoord) (yyc-ray);
+    wxCoord xxx2 = (wxCoord) (xxc+ray);
+    wxCoord yyy2 = (wxCoord) (yyc+ray);

     if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT)
     {
         // Have to add 1 to bottom-right corner of rectangle
     if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT)
     {
         // Have to add 1 to bottom-right corner of rectangle


@@ -421,11 +405,46 @@ void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
         Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
         xx1,yy1,xx2,yy2);
 
         Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
         xx1,yy1,xx2,yy2);
 

-    CalcBoundingBox((xc-radius), (yc-radius));
-    CalcBoundingBox((xc+radius), (yc+radius));
+    CalcBoundingBox((wxCoord)(xc-radius), (wxCoord)(yc-radius));
+    CalcBoundingBox((wxCoord)(xc+radius), (wxCoord)(yc+radius));
+}
+
+void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+                           wxCoord width, wxCoord height)
+{
+    wxCoord x2 = x1 + width,
+            y2 = y1 + height;
+
+#if defined(__WIN32__) && !defined(__SC__)
+    RECT rect;
+    rect.left   = x1;
+    rect.top    = y1;
+    rect.right  = x2;
+    rect.bottom = y2;
+
+    DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
+#else // Win16
+    // In WIN16, draw a cross
+    HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
+    HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH);
+    HPEN hPenOld = (HPEN)::SelectObject(hdcMem, blackPen);
+    HPEN hBrushOld = (HPEN)::SelectObject(hdcMem, whiteBrush);
+    ::SetROP2(GetHdc(), R2_COPYPEN);
+    Rectangle(GetHdc(), x1, y1, x2, y2);
+    MoveTo(GetHdc(), x1, y1);
+    LineTo(GetHdc(), x2, y2);
+    MoveTo(GetHdc(), x2, y1);
+    LineTo(GetHdc(), x1, y2);
+    ::SelectObject(GetHdc(), hPenOld);
+    ::SelectObject(GetHdc(), hBrushOld);
+    ::DeleteObject(blackPen);
+#endif // Win32/16
+
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);

 }
 
 }
 

-void wxDC::DoDrawPoint(long x, long y)
+void wxDC::DoDrawPoint(wxCoord x, wxCoord y)

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


@@ -438,8 +457,30 @@ void wxDC::DoDrawPoint(long x, long y)
     CalcBoundingBox(x, y);
 }
 
     CalcBoundingBox(x, y);
 }
 

-void wxDC::DoDrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int fillStyle)
+void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)

 {
 {

+    COLORREF old_textground = ::GetTextColor(GetHdc());
+    COLORREF old_background = ::GetBkColor(GetHdc());
+    if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE)
+    {
+
+       if (m_textForegroundColour.Ok())
+       {   //just the oposite from what is expected see help on pattern brush
+           // 1 in mask becomes bk color
+           ::SetBkColor(GetHdc(), m_textForegroundColour.GetPixel() );
+       }
+       if (m_textBackgroundColour.Ok())
+       {   //just the oposite from what is expected
+           // 0 in mask becomes text color
+           ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+       }
+
+       if (m_backgroundMode == wxTRANSPARENT)
+           SetBkMode(GetHdc(), TRANSPARENT);
+       else
+           SetBkMode(GetHdc(), OPAQUE);
+    }
+

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


@@ -467,9 +508,16 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int
         (void)Polygon(GetHdc(), (POINT*) points, n);
         SetPolyFillMode(GetHdc(),prev);
     }
         (void)Polygon(GetHdc(), (POINT*) points, n);
         SetPolyFillMode(GetHdc(),prev);
     }

+
+    if (m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE)
+    {
+       ::SetBkMode(GetHdc(), TRANSPARENT);
+       ::SetTextColor(GetHdc(), old_textground);
+       ::SetBkColor(GetHdc(), old_background);
+    }

 }
 
 }
 

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

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


@@ -496,51 +544,61 @@ void wxDC::DoDrawLines(int n, wxPoint points[], long xoffset, long yoffset)
     }
 }
 
     }
 }
 

-void wxDC::DoDrawRectangle(long x, long y, long width, long height)
+void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
 {

-    long x2 = x + width;
-    long y2 = y + height;
-
-    /* MATTHEW: [6] new normalization */
-#if WX_STANDARD_GRAPHICS
-    bool do_brush, do_pen;
-
-    do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
-    do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;
+    COLORREF colFgOld = 0,
+             colBgOld = 0;

 
 

-    if (do_brush) {
-        HPEN orig_pen = NULL;
+    if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+    {
+        colFgOld = ::GetTextColor(GetHdc());
+        colBgOld = ::GetBkColor(GetHdc());

 
 

-        if (do_pen || !m_pen.Ok())
-            orig_pen = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
+        if ( m_textForegroundColour.Ok() )
+        {
+            // just the oposite from what is expected see help on pattern brush
+            // 1 in mask becomes bk color
+            ::SetBkColor(GetHdc(), m_textForegroundColour.GetPixel());
+        }

 
 

-        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
-            XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);
+        if ( m_textBackgroundColour.Ok() )
+        {
+            // 0 in mask becomes text color
+            ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel());
+        }

 
 

-        if (do_pen || !m_pen.Ok())
-            ::SelectObject(GetHdc() , orig_pen);
+        // VZ: IMHO this does strictly nothing here
+        SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
+                                                              : OPAQUE);

     }
     }

-    if (do_pen) {
-        HBRUSH orig_brush = NULL;

 
 

-        if (do_brush || !m_brush.Ok())
-            orig_brush = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH) ::GetStockObject(NULL_BRUSH));
+    wxCoord x2 = x + width;
+    wxCoord y2 = y + height;

 
 

-        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
-            XLOG2DEV(x2), YLOG2DEV(y2));
-
-        if (do_brush || !m_brush.Ok())
-            ::SelectObject(GetHdc(), orig_brush);
+    // 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 )
+    {
+        x2++;
+        y2++;

     }
     }

-#else
+

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

-#endif

 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);

+
+    if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+    {
+        // restore the colours we changed
+        ::SetBkMode(GetHdc(), TRANSPARENT);
+        ::SetTextColor(GetHdc(), colFgOld);
+        ::SetBkColor(GetHdc(), colBgOld);
+    }

 }
 
 }
 

-void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, double radius)
+void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)

 {
     // Now, a negative radius value is interpreted to mean
     // 'the proportion of the smallest X or Y dimension'
 {
     // Now, a negative radius value is interpreted to mean
     // 'the proportion of the smallest X or Y dimension'


@@ -555,8 +613,17 @@ void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, doubl
         radius = (- radius * smallest);
     }
 
         radius = (- radius * smallest);
     }
 

-    long x2 = (x+width);
-    long y2 = (y+height);
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);
+
+    // 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 )
+    {
+        x2++;
+        y2++;
+    }

 
     (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
         YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));
 
     (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
         YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));


@@ -565,10 +632,10 @@ void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, doubl
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DoDrawEllipse(long x, long y, long width, long height)
+void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
 {

-    long x2 = (x+width);
-    long y2 = (y+height);
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);

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


@@ -577,20 +644,23 @@ void wxDC::DoDrawEllipse(long x, long y, long width, long height)
 }
 
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
 }
 
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows

-void wxDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
+void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)

 {
 {

-    long x2 = (x+w);
-    long y2 = (y+h);
+    wxCoord x2 = (x+w);
+    wxCoord y2 = (y+h);

 
 

-    const double deg2rad = 3.14159265359 / 180.0;

     int rx1 = XLOG2DEV(x+w/2);
     int ry1 = YLOG2DEV(y+h/2);
     int rx2 = rx1;
     int ry2 = ry1;
     int rx1 = XLOG2DEV(x+w/2);
     int ry1 = YLOG2DEV(y+h/2);
     int rx2 = rx1;
     int ry2 = ry1;

-    rx1 += (int)(100.0 * abs(w) * cos(sa * deg2rad));
-    ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa * deg2rad));
-    rx2 += (int)(100.0 * abs(w) * cos(ea * deg2rad));
-    ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea * deg2rad));
+
+    sa = DegToRad(sa);
+    ea = DegToRad(ea);
+
+    rx1 += (int)(100.0 * abs(w) * cos(sa));
+    ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa));
+    rx2 += (int)(100.0 * abs(w) * cos(ea));
+    ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea));

 
     // draw pie with NULL_PEN first and then outline otherwise a line is
     // drawn from the start and end points to the centre
 
     // draw pie with NULL_PEN first and then outline otherwise a line is
     // drawn from the start and end points to the centre


@@ -613,83 +683,198 @@ void wxDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DoDrawIcon(const wxIcon& icon, long x, long y)
+void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)

 {
 {

-#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
-    ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
-        icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
-#else
-    ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());
-#endif
+    wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
+
+    ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));

 
     CalcBoundingBox(x, y);
 
     CalcBoundingBox(x, y);

-    CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight());
+    CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());

 }
 
 }
 

-void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
+void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )

 {
 {

-    if (!bmp.Ok())
-        return;
+    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
+
+    int width = bmp.GetWidth(),
+        height = bmp.GetHeight();
+
+    HBITMAP hbmpMask = 0;
+
+    if ( useMask )
+    {
+        wxMask *mask = bmp.GetMask();
+        if ( mask )
+            hbmpMask = (HBITMAP)mask->GetMaskBitmap();

 
 

-    // If we're not drawing transparently, and not drawing to a printer,
-    // optimize this function to use Windows functions.
-    if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
+        if ( !hbmpMask )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = FALSE;
+        }
+    }
+
+    if ( useMask )
+    {
+#ifdef __WIN32__
+        HDC hdcMem = ::CreateCompatibleDC(GetHdc());
+        ::SelectObject(hdcMem, GetHbitmapOf(bmp));
+
+        // use MaskBlt() with ROP which doesn't do anything to dst in the mask
+        // points
+        bool ok = ::MaskBlt(GetHdc(), x, y, width, height,
+                            hdcMem, 0, 0,
+                            hbmpMask, 0, 0,
+                            MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
+        ::DeleteDC(hdcMem);
+
+        if ( !ok )
+#endif // Win32
+        {
+            // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
+            // level
+            wxMemoryDC memDC;
+            memDC.SelectObject(bmp);
+
+            Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+
+            memDC.SelectObject(wxNullBitmap);
+        }
+    }
+    else // no mask, just use BitBlt()

     {
         HDC cdc = GetHdc();
         HDC memdc = ::CreateCompatibleDC( cdc );
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
     {
         HDC cdc = GetHdc();
         HDC memdc = ::CreateCompatibleDC( cdc );
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );

+
+        wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
+
+        COLORREF old_textground = ::GetTextColor(GetHdc());
+        COLORREF old_background = ::GetBkColor(GetHdc());
+        if (m_textForegroundColour.Ok())
+        {
+            ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
+        }
+        if (m_textBackgroundColour.Ok())
+        {
+            ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+        }
+

         ::SelectObject( memdc, hbitmap );
         ::SelectObject( memdc, hbitmap );

-        ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
+        ::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY);

         ::DeleteDC( memdc );
         ::DeleteDC( memdc );

-    }
-    else
-    {
-        // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
-        wxMemoryDC memDC;
-        memDC.SelectObject(bmp);
-
-        /* Not sure if we need this. The mask should leave the
-        * masked areas as per the original background of this DC.
-        */
-        /*
-        // There might be transparent areas, so make these
-        // the same colour as this DC
-        memDC.SetBackground(* GetBackground());
-        memDC.Clear();
-        */
-
-        Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask);
-
-        memDC.SelectObject(wxNullBitmap);
+
+        ::SetTextColor(GetHdc(), old_textground);
+        ::SetBkColor(GetHdc(), old_background);

     }
 }
 
     }
 }
 

-void wxDC::DoDrawText(const wxString& text, long x, long y)
+void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)

 {
 {

-    if (m_textForegroundColour.Ok())
-        SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
+    DrawAnyText(text, x, y);
+
+    // update the bounding box
+    CalcBoundingBox(x, y);
+
+    wxCoord w, h;
+    GetTextExtent(text, &w, &h);
+    CalcBoundingBox(x + w, y + h);
+}
+
+void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
+{
+    // prepare for drawing the text
+    if ( m_textForegroundColour.Ok() )
+        SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());

 
     DWORD old_background = 0;
 
     DWORD old_background = 0;

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

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

-    if (m_backgroundMode == wxTRANSPARENT)
-        SetBkMode(GetHdc(), TRANSPARENT);
-    else
-        SetBkMode(GetHdc(), OPAQUE);
+    SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
+                                                          : OPAQUE);

 
 

-    (void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
+    if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                   text.c_str(), text.length()) == 0 )
+    {
+        wxLogLastError("TextOut");
+    }

 
 

-    if (m_textBackgroundColour.Ok())
+    // 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() )

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

-    CalcBoundingBox(x, y);
+    SetBkMode(GetHdc(), TRANSPARENT);
+}

 
 

-    long w, h;
-    GetTextExtent(text, &w, &h);
-    CalcBoundingBox((x + w), (y + h));
+void wxDC::DoDrawRotatedText(const wxString& text,
+                             wxCoord x, wxCoord y,
+                             double angle)
+{
+    // we test that we have some font because otherwise we should still use the
+    // "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() )
+    {
+        DoDrawText(text, x, y);
+    }
+    else
+    {
+        // NB: don't take DEFAULT_GUI_FONT because it's not TrueType and so
+        //     can't have non zero orientation/escapement
+        wxFont font = m_font.Ok() ? m_font : *wxNORMAL_FONT;
+        HFONT hfont = (HFONT)font.GetResourceHandle();
+        LOGFONT lf;
+        if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
+        {
+            wxLogLastError("GetObject(hfont)");
+        }
+
+        // GDI wants the angle in tenth of degree
+        long angle10 = (long)(angle * 10);
+        lf.lfEscapement = angle10;
+        lf. lfOrientation = angle10;
+
+        hfont = ::CreateFontIndirect(&lf);
+        if ( !hfont )
+        {
+            wxLogLastError("CreateFont");
+        }
+        else
+        {
+            HFONT hfontOld = (HFONT)::SelectObject(GetHdc(), hfont);
+
+            DrawAnyText(text, x, y);
+
+            (void)::SelectObject(GetHdc(), hfontOld);
+            (void)::DeleteObject(hfont);
+        }
+
+        // call the bounding box by adding all four vertices of the rectangle
+        // containing the text to it (simpler and probably not slower than
+        // determining which of them is really topmost/leftmost/...)
+        wxCoord w, h;
+        GetTextExtent(text, &w, &h);
+
+        double rad = DegToRad(angle);
+
+        // "upper left" and "upper right"
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
+
+        // "bottom left" and "bottom right"
+        x += (wxCoord)(h*sin(rad));
+        y += (wxCoord)(h*cos(rad));
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
+    }

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


@@ -755,7 +940,7 @@ void wxDC::SetFont(const wxFont& the_font)
         HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
         if (f == (HFONT) NULL)
         {
         HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
         if (f == (HFONT) NULL)
         {

-            wxLogDebug("::SelectObject failed in wxDC::SetFont.");
+            wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));

         }
         if (!m_oldFont)
             m_oldFont = (WXHFONT) f;
         }
         if (!m_oldFont)
             m_oldFont = (WXHFONT) f;


@@ -868,47 +1053,56 @@ void wxDC::SetBackgroundMode(int mode)
 {
     m_backgroundMode = mode;
 
 {
     m_backgroundMode = mode;
 

+    // SetBackgroundColour now only refers to text background
+    // and m_backgroundMode is used there
+
+/*

     if (m_backgroundMode == wxTRANSPARENT)
         ::SetBkMode(GetHdc(), TRANSPARENT);
     else
         ::SetBkMode(GetHdc(), OPAQUE);
     if (m_backgroundMode == wxTRANSPARENT)
         ::SetBkMode(GetHdc(), TRANSPARENT);
     else
         ::SetBkMode(GetHdc(), OPAQUE);

+*/

 }
 
 void wxDC::SetLogicalFunction(int function)
 {
     m_logicalFunction = function;
 
 }
 
 void wxDC::SetLogicalFunction(int function)
 {
     m_logicalFunction = function;
 

-    SetRop((WXHDC) m_hDC);
+    SetRop(m_hDC);

 }
 
 void wxDC::SetRop(WXHDC dc)
 {
 }
 
 void wxDC::SetRop(WXHDC dc)
 {

-    if (!dc || m_logicalFunction < 0)
+    if ( !dc || m_logicalFunction < 0 )

         return;
 
         return;
 

-    int c_rop;
-    // These may be wrong
+    int rop;
+

     switch (m_logicalFunction)
     {
     switch (m_logicalFunction)
     {

-        //    case wxXOR: c_rop = R2_XORPEN; break;
-    case wxXOR: c_rop = R2_NOTXORPEN; break;
-    case wxINVERT: c_rop = R2_NOT; break;
-    case wxOR_REVERSE: c_rop = R2_MERGEPENNOT; break;
-    case wxAND_REVERSE: c_rop = R2_MASKPENNOT; break;
-    case wxCLEAR: c_rop = R2_WHITE; break;
-    case wxSET: c_rop = R2_BLACK; break;
-    case wxSRC_INVERT: c_rop = R2_NOTCOPYPEN; break;
-    case wxOR_INVERT: c_rop = R2_MERGENOTPEN; break;
-    case wxAND: c_rop = R2_MASKPEN; break;
-    case wxOR: c_rop = R2_MERGEPEN; break;
-    case wxAND_INVERT: c_rop = R2_MASKNOTPEN; break;
-    case wxEQUIV:
-    case wxNAND:
-    case wxCOPY:
-    default:
-        c_rop = R2_COPYPEN; break;
+        case wxCLEAR:        rop = R2_BLACK;         break;
+        case wxXOR:          rop = R2_XORPEN;        break;
+        case wxINVERT:       rop = R2_NOT;           break;
+        case wxOR_REVERSE:   rop = R2_MERGEPENNOT;   break;
+        case wxAND_REVERSE:  rop = R2_MASKPENNOT;    break;
+        case wxCOPY:         rop = R2_COPYPEN;       break;
+        case wxAND:          rop = R2_MASKPEN;       break;
+        case wxAND_INVERT:   rop = R2_MASKNOTPEN;    break;
+        case wxNO_OP:        rop = R2_NOP;           break;
+        case wxNOR:          rop = R2_NOTMERGEPEN;   break;
+        case wxEQUIV:        rop = R2_NOTXORPEN;     break;
+        case wxSRC_INVERT:   rop = R2_NOTCOPYPEN;    break;
+        case wxOR_INVERT:    rop = R2_MERGENOTPEN;   break;
+        case wxNAND:         rop = R2_NOTMASKPEN;    break;
+        case wxOR:           rop = R2_MERGEPEN;      break;
+        case wxSET:          rop = R2_WHITE;         break;
+
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return;

     }
     }

-    SetROP2((HDC) dc, c_rop);
+
+    SetROP2(GetHdc(), rop);

 }
 
 bool wxDC::StartDoc(const wxString& message)
 }
 
 bool wxDC::StartDoc(const wxString& message)


@@ -933,7 +1127,7 @@ void wxDC::EndPage()
 // text metrics
 // ---------------------------------------------------------------------------
 
 // text metrics
 // ---------------------------------------------------------------------------
 

-long wxDC::GetCharHeight() const
+wxCoord wxDC::GetCharHeight() const

 {
     TEXTMETRIC lpTextMetric;
 
 {
     TEXTMETRIC lpTextMetric;
 


@@ -942,7 +1136,7 @@ long wxDC::GetCharHeight() const
     return YDEV2LOGREL(lpTextMetric.tmHeight);
 }
 
     return YDEV2LOGREL(lpTextMetric.tmHeight);
 }
 

-long wxDC::GetCharWidth() const
+wxCoord wxDC::GetCharWidth() const

 {
     TEXTMETRIC lpTextMetric;
 
 {
     TEXTMETRIC lpTextMetric;
 


@@ -951,9 +1145,9 @@ long wxDC::GetCharWidth() const
     return XDEV2LOGREL(lpTextMetric.tmAveCharWidth);
 }
 
     return XDEV2LOGREL(lpTextMetric.tmAveCharWidth);
 }
 

-void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
-                         long *descent, long *externalLeading,
-                         wxFont *theFont) const
+void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+                           wxCoord *descent, wxCoord *externalLeading,
+                           wxFont *theFont) const

 {
     wxFont *fontToUse = (wxFont*) theFont;
     if (!fontToUse)
 {
     wxFont *fontToUse = (wxFont*) theFont;
     if (!fontToUse)


@@ -962,7 +1156,7 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
     SIZE sizeRect;
     TEXTMETRIC tm;
 
     SIZE sizeRect;
     TEXTMETRIC tm;
 

-    GetTextExtentPoint(GetHdc(), (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
+    GetTextExtentPoint(GetHdc(), WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);

     GetTextMetrics(GetHdc(), &tm);
 
     if (x) *x = XDEV2LOGREL(sizeRect.cx);
     GetTextMetrics(GetHdc(), &tm);
 
     if (x) *x = XDEV2LOGREL(sizeRect.cx);


@@ -1063,7 +1257,7 @@ void wxDC::SetSystemScale(double x, double y)
     SetMapMode(m_mappingMode);
 }
 
     SetMapMode(m_mappingMode);
 }
 

-void wxDC::SetLogicalOrigin(long x, long y)
+void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)

 {
     m_logicalOriginX = x;
     m_logicalOriginY = y;
 {
     m_logicalOriginX = x;
     m_logicalOriginY = y;


@@ -1071,7 +1265,7 @@ void wxDC::SetLogicalOrigin(long x, long y)
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
 }
 
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
 }
 

-void wxDC::SetDeviceOrigin(long x, long y)
+void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)

 {
     m_deviceOriginX = x;
     m_deviceOriginY = y;
 {
     m_deviceOriginX = x;
     m_deviceOriginY = y;


@@ -1083,59 +1277,69 @@ void wxDC::SetDeviceOrigin(long x, long y)
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
 // coordinates transformations
 // ---------------------------------------------------------------------------
 

-long wxDCBase::DeviceToLogicalX(long x) const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const

 {
 {

-    return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX);
+    return (wxCoord) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX) - m_logicalOriginX);

 }
 
 }
 

-long wxDCBase::DeviceToLogicalXRel(long x) const
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const

 {
 {

-    return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX));
+    return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX));

 }
 
 }
 

-long wxDCBase::DeviceToLogicalY(long y) const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const

 {
 {

-    return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY);
+    return (wxCoord) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY) - m_logicalOriginY);

 }
 
 }
 

-long wxDCBase::DeviceToLogicalYRel(long y) const
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const

 {
 {

-    return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY));
+    return (wxCoord) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY));

 }
 
 }
 

-long wxDCBase::LogicalToDeviceX(long x) const
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const

 {
 {

-    return (long) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);
+    return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);

 }
 
 }
 

-long wxDCBase::LogicalToDeviceXRel(long x) const
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const

 {
 {

-    return (long) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);
+    return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);

 }
 
 }
 

-long wxDCBase::LogicalToDeviceY(long y) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const

 {
 {

-    return (long) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);
+    return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);

 }
 
 }
 

-long wxDCBase::LogicalToDeviceYRel(long y) const
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const

 {
 {

-    return (long) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);
+    return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);

 }
 
 // ---------------------------------------------------------------------------
 // bit blit
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------
 // bit blit
 // ---------------------------------------------------------------------------

-bool wxDC::DoBlit(long xdest, long ydest, long width, long height,
-                  wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
+
+bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
+                  wxCoord width, wxCoord height,
+                  wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                  int rop, bool useMask)

 {
 {

-    long xdest1 = xdest;
-    long ydest1 = ydest;
-    long xsrc1 = xsrc;
-    long ysrc1 = ysrc;
+    wxMask *mask = NULL;
+    if ( useMask )
+    {
+        const wxBitmap& bmp = source->m_selectedBitmap;
+        mask = bmp.GetMask();
+
+        if ( !(bmp.Ok() && mask && mask->GetMaskBitmap()) )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = FALSE;
+        }
+    }

 
 

-    // Chris Breeze 18/5/98: use text foreground/background colours
-    // when blitting from 1-bit bitmaps

     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());
     if (m_textForegroundColour.Ok())
     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());
     if (m_textForegroundColour.Ok())


@@ -1147,146 +1351,115 @@ bool wxDC::DoBlit(long xdest, long ydest, long width, long height,
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 

-    DWORD dwRop = rop == wxCOPY ? SRCCOPY :
-    rop == wxCLEAR ? WHITENESS :
-    rop == wxSET ? BLACKNESS :
-    rop == wxINVERT ? DSTINVERT :
-    rop == wxAND ? MERGECOPY :
-    rop == wxOR ? MERGEPAINT :
-    rop == wxSRC_INVERT ? NOTSRCCOPY :
-    rop == wxXOR ? SRCINVERT :
-    rop == wxOR_REVERSE ? MERGEPAINT :
-    rop == wxAND_REVERSE ? SRCERASE :
-    rop == wxSRC_OR ? SRCPAINT :
-    rop == wxSRC_AND ? SRCAND :
-    SRCCOPY;
-
-    bool success = TRUE;
-    if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask())
+    DWORD dwRop = SRCCOPY;
+    switch (rop)

     {
     {

+        case wxXOR:          dwRop = SRCINVERT;        break;
+        case wxINVERT:       dwRop = DSTINVERT;        break;
+        case wxOR_REVERSE:   dwRop = 0x00DD0228;       break;
+        case wxAND_REVERSE:  dwRop = SRCERASE;         break;
+        case wxCLEAR:        dwRop = BLACKNESS;        break;
+        case wxSET:          dwRop = WHITENESS;        break;
+        case wxOR_INVERT:    dwRop = MERGEPAINT;       break;
+        case wxAND:          dwRop = SRCAND;           break;
+        case wxOR:           dwRop = SRCPAINT;         break;
+        case wxEQUIV:        dwRop = 0x00990066;       break;
+        case wxNAND:         dwRop = 0x007700E6;       break;
+        case wxAND_INVERT:   dwRop = 0x00220326;       break;
+        case wxCOPY:         dwRop = SRCCOPY;          break;
+        case wxNO_OP:        dwRop = DSTCOPY;          break;
+        case wxSRC_INVERT:   dwRop = NOTSRCCOPY;       break;
+        case wxNOR:          dwRop = NOTSRCCOPY;       break;
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return FALSE;
+    }

 
 

-#if 0 // __WIN32__
-        // Not implemented under Win95 (or maybe a specific device?)
-        if (MaskBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,
-            (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(),
-            0, 0, 0xAACC0020))
-        {
-            // Success
-        }
-        else
-#endif
+    bool success;
+
+    if (useMask)
+    {
+#ifdef __WIN32__
+        // we want the part of the image corresponding to the mask to be
+        // transparent, so use "DSTCOPY" ROP for the mask points (the usual
+        // meaning of fg and bg is inverted which corresponds to wxWin notion
+        // of the mask which is also contrary to the Windows one)
+        success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
+                            GetHdcOf(*source), xsrc, ysrc,
+                            (HBITMAP)mask->GetMaskBitmap(), 0, 0,
+                            MAKEROP4(dwRop, DSTCOPY)) != 0;
+
+        if ( !success )
+#endif // Win32

         {
         {

-            // Old code
-#if 0
-            HDC dc_mask = CreateCompatibleDC((HDC) source->m_hDC);
-            ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-            success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,
-                dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0);
-            success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,
-                (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0);
-            ::SelectObject(dc_mask, 0);
-            ::DeleteDC(dc_mask);
-#endif
-            // New code from Chris Breeze, 15/7/98

             // Blit bitmap with mask
 
             // Blit bitmap with mask
 

-            if (IsKindOf(CLASSINFO(wxPrinterDC)))
+            // create a temp buffer bitmap and DCs to access it and the mask
+            HDC dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+            HDC dc_buffer = ::CreateCompatibleDC(GetHdc());
+            HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
+            ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
+            ::SelectObject(dc_buffer, buffer_bmap);
+
+            // copy dest to buffer
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdc(), xdest, ydest, SRCCOPY) )

             {
             {

-                // If we are printing source colours are screen colours
-                // not printer colours and so we need copy the bitmap
-                // pixel by pixel.
-                RECT rect;
-                HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
-                HDC dc_src = (HDC) source->m_hDC;
-
-                ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-                for (int x = 0; x < width; x++)
-                {
-                    for (int y = 0; y < height; y++)
-                    {
-                        COLORREF cref = ::GetPixel(dc_mask, x, y);
-                        if (cref)
-                        {
-                            HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
-                            rect.left = xdest1 + x; rect.right = rect.left + 1;
-                            rect.top = ydest1 + y;  rect.bottom = rect.top + 1;
-                            ::FillRect(GetHdc(), &rect, brush);
-                            ::DeleteObject(brush);
-                        }
-                    }
-                }
-                ::SelectObject(dc_mask, 0);
-                ::DeleteDC(dc_mask);
+                wxLogLastError("BitBlt");

             }
             }

-            else
+
+            // copy src to buffer using selected raster op
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdcOf(*source), xsrc, ysrc, dwRop) )

             {
             {

-                // create a temp buffer bitmap and DCs to access it and the mask
-                HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
-                HDC dc_buffer = ::CreateCompatibleDC(GetHdc());
-                HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
-                ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-                ::SelectObject(dc_buffer, buffer_bmap);
-
-                // copy dest to buffer
-                ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                    GetHdc(), xdest1, ydest1, SRCCOPY);
-
-                // copy src to buffer using selected raster op
-                ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                    (HDC) source->m_hDC, xsrc1, ysrc1, dwRop);
-
-                // set masked area in buffer to BLACK (pixel value 0)
-                COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
-                COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
-                ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                    dc_mask, xsrc1, ysrc1, SRCAND);
-
-                // set unmasked area in dest to BLACK
-                ::SetBkColor(GetHdc(), RGB(0, 0, 0));
-                ::SetTextColor(GetHdc(), RGB(255, 255, 255));
-                ::BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,
-                    dc_mask, xsrc1, ysrc1, SRCAND);
-                ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
-                ::SetTextColor(GetHdc(), prevCol);
-
-                // OR buffer to dest
-                success = (::BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,
-                    dc_buffer, 0, 0, SRCPAINT) != 0);
-
-                // tidy up temporary DCs and bitmap
-                ::SelectObject(dc_mask, 0);
-                ::DeleteDC(dc_mask);
-                ::SelectObject(dc_buffer, 0);
-                ::DeleteDC(dc_buffer);
-                ::DeleteObject(buffer_bmap);
+                wxLogLastError("BitBlt");

             }
             }

-        }
-    }
-    else
-    {
-        if (IsKindOf(CLASSINFO(wxPrinterDC)))
-        {
-            // If we are printing, source colours are screen colours
-            // not printer colours and so we need copy the bitmap
-            // pixel by pixel.
-            HDC dc_src = (HDC) source->m_hDC;
-            RECT rect;
-            for (int x = 0; x < width; x++)
+
+            // set masked area in buffer to BLACK (pixel value 0)
+            COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
+            COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           dc_mask, xsrc, ysrc, SRCAND) )

             {
             {

-                for (int y = 0; y < height; y++)
-                {
-                    HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
-                    rect.left = xdest1 + x;   rect.right = rect.left + 1;
-                    rect.top = ydest1 + y;    rect.bottom = rect.top + 1;
-                    ::FillRect(GetHdc(), &rect, brush);
-                    ::DeleteObject(brush);
-                }
+                wxLogLastError("BitBlt");

             }
             }

+
+            // set unmasked area in dest to BLACK
+            ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+            ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+            if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
+                           dc_mask, xsrc, ysrc, SRCAND) )
+            {
+                wxLogLastError("BitBlt");
+            }
+            ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
+            ::SetTextColor(GetHdc(), prevCol);
+
+            // OR buffer to dest
+            success = ::BitBlt(GetHdc(), xdest, ydest,
+                               (int)width, (int)height,
+                               dc_buffer, 0, 0, SRCPAINT) != 0;
+            if ( !success )
+            {
+                wxLogLastError("BitBlt");
+            }
+
+            // tidy up temporary DCs and bitmap
+            ::SelectObject(dc_mask, 0);
+            ::DeleteDC(dc_mask);
+            ::SelectObject(dc_buffer, 0);
+            ::DeleteDC(dc_buffer);
+            ::DeleteObject(buffer_bmap);

         }
         }

-        else
+    }
+    else // no mask, just BitBlt() it
+    {
+        success = ::BitBlt(GetHdc(), xdest, ydest,
+                           (int)width, (int)height,
+                           GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
+        if ( !success )

         {
         {

-            success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,
-                xsrc1, ysrc1, dwRop) != 0);
+            wxLogLastError("BitBlt");

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


@@ -1327,7 +1500,7 @@ void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
                          float *descent, float *externalLeading,
                          wxFont *theFont, bool use16bit) const
 {
                          float *descent, float *externalLeading,
                          wxFont *theFont, bool use16bit) const
 {

-    long x1, y1, descent1, externalLeading1;
+    wxCoord x1, y1, descent1, externalLeading1;

     GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
     *x = x1; *y = y1;
     if (descent)
     GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
     *x = x1; *y = y1;
     if (descent)