Add some new files for interface additions

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 11d5f1aab8f05681fafbc16a2745a7494148df43..b9d10eac95b4f20dc50d28cbf4e02df351e75ba2 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -82,10 +82,87 @@ static const int MM_METRIC = 10;
 // convert degrees to radians
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 
 // convert degrees to radians
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 

+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// instead of duplicating the same code which sets and then restores text
+// colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
+// encapsulate this in a small helper class
+
+// wxColourChanger: changes the text colours in the ctor if required and
+//                  restores them in the dtor
+class wxColourChanger
+{
+public:
+    wxColourChanger(wxDC& dc);
+   ~wxColourChanger();
+
+private:
+    wxDC& m_dc;
+
+    COLORREF m_colFgOld, m_colBgOld;
+
+    bool m_changed;
+};
+

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

+// ----------------------------------------------------------------------------
+// wxColourChanger
+// ----------------------------------------------------------------------------
+
+wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+{
+    if ( dc.GetBrush().GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+    {
+        HDC hdc = GetHdcOf(dc);
+        m_colFgOld = ::GetTextColor(hdc);
+        m_colBgOld = ::GetBkColor(hdc);
+
+        // note that Windows convention is opposite to wxWindows one, this is
+        // why text colour becomes the background one and vice versa
+        const wxColour& colFg = dc.GetTextForeground();
+        if ( colFg.Ok() )
+        {
+            ::SetBkColor(hdc, colFg.GetPixel());
+        }
+
+        const wxColour& colBg = dc.GetTextBackground();
+        if ( colBg.Ok() )
+        {
+            ::SetTextColor(hdc, colBg.GetPixel());
+        }
+
+        SetBkMode(hdc,
+                  dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
+                                                          : OPAQUE);
+
+        // flag which telsl us to undo changes in the dtor
+        m_changed = TRUE;
+    }
+    else
+    {
+        // nothing done, nothing to undo
+        m_changed = FALSE;
+    }
+}
+
+wxColourChanger::~wxColourChanger()
+{
+    if ( m_changed )
+    {
+        // restore the colours we changed
+        HDC hdc = GetHdcOf(m_dc);
+
+        ::SetBkMode(hdc, TRANSPARENT);
+        ::SetTextColor(hdc, m_colFgOld);
+        ::SetBkColor(hdc, m_colBgOld);
+    }
+}
+

 // ---------------------------------------------------------------------------
 // wxDC
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxDC
 // ---------------------------------------------------------------------------


@@ -175,43 +252,39 @@ void wxDC::SelectOldObjects(WXHDC dc)
 // clipping
 // ---------------------------------------------------------------------------
 
 // clipping
 // ---------------------------------------------------------------------------
 

+#define DO_SET_CLIPPING_BOX()                   \
+{                                               \
+    RECT rect;                                  \
+                                                \
+    GetClipBox(GetHdc(), &rect);                \
+                                                \
+    m_clipX1 = (wxCoord) XDEV2LOG(rect.left);   \
+    m_clipY1 = (wxCoord) YDEV2LOG(rect.top);    \
+    m_clipX2 = (wxCoord) XDEV2LOG(rect.right);  \
+    m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom); \
+}
+

 void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
 {
     m_clipping = TRUE;
 void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
 {
     m_clipping = TRUE;

-    m_clipX1 = (int)cx;
-    m_clipY1 = (int)cy;
-    m_clipX2 = (int)(cx + cw);
-    m_clipY2 = (int)(cy + ch);
-
-    DoClipping((WXHDC) m_hDC);
+    IntersectClipRect(GetHdc(), XLOG2DEV(cx), YLOG2DEV(cy),
+                                XLOG2DEV(cx + cw), YLOG2DEV(cy + ch));
+    DO_SET_CLIPPING_BOX()

 }
 
 void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {
     wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
 
 }
 
 void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {
     wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
 

-    wxRect box = region.GetBox();
-

     m_clipping = TRUE;
     m_clipping = TRUE;

-    m_clipX1 = box.x;
-    m_clipY1 = box.y;
-    m_clipX2 = box.x + box.width;
-    m_clipY2 = box.y + box.height;

 
 #ifdef __WIN16__
     SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());
 #else
     ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND);
 #endif
 
 #ifdef __WIN16__
     SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());
 #else
     ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND);
 #endif

-}

 
 

-void wxDC::DoClipping(WXHDC dc)
-{
-    if (m_clipping && dc)
-    {
-        IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
-                                    XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
-    }
+    DO_SET_CLIPPING_BOX()

 }
 
 void wxDC::DestroyClippingRegion()
 }
 
 void wxDC::DestroyClippingRegion()


@@ -307,7 +380,7 @@ void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
         //      * The point is outside the clipping region that is, it is not
         //        visible on the device.
         //
         //      * The point is outside the clipping region that is, it is not
         //        visible on the device.
         //

-        wxLogLastError("ExtFloodFill");
+        wxLogLastError(wxT("ExtFloodFill"));

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


@@ -315,27 +388,14 @@ void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {

+    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));
 
     // 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())
-    {
-        pencolor = m_pen.GetColour().GetPixel();
-    }
+    wxRGBToColour(*col, pixelcolor);

 
 

-    // return the color of the pixel
-    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 and return TRUE if it is, FALSE otherwise
-    return pixelcolor == pencolor;
+    return TRUE;

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


@@ -368,14 +428,23 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wxCoord yc)
+// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
+// and ending at (x2, y2)
+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)
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    double dx = xc - x1;
+    double dy = yc - y1;
+    double radius = (double)sqrt(dx*dx+dy*dy);
+    wxCoord r = (wxCoord)radius;
+
+    // treat the special case of full circle separately
+    if ( x1 == x2 && y1 == y2 )

     {
     {

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

         return;
     }
 
         return;
     }
 


@@ -387,27 +456,27 @@ void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wx
     wxCoord yyc = YLOG2DEV(yc);
     wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1)));
 
     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);

     wxCoord xxx1 = (wxCoord) (xxc-ray);
     wxCoord yyy1 = (wxCoord) (yyc-ray);
     wxCoord xxx2 = (wxCoord) (xxc+ray);
     wxCoord yyy2 = (wxCoord) (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)
+
+    if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )

     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).
         // Unfortunately this is not a reliable method, depends
         // on the size of shape.
         // TODO: figure out why this happens!
     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).
         // Unfortunately this is not a reliable method, depends
         // on the size of shape.
         // TODO: figure out why this happens!

-        Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1,
-            xx1,yy1,xx2,yy2);
+        Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2);

     }
     else
     }
     else

-        Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
-        xx1,yy1,xx2,yy2);
+    {
+        Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2);
+    }

 
 

-    CalcBoundingBox((wxCoord)(xc-radius), (wxCoord)(yc-radius));
-    CalcBoundingBox((wxCoord)(xc+radius), (wxCoord)(yc+radius));
+    CalcBoundingBox(xc - r, yc - r);
+    CalcBoundingBox(xc + r, yc + r);

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


@@ -460,27 +529,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)
 {

-    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);
-    }
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

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


@@ -509,13 +558,6 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
         (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[], wxCoord xoffset, wxCoord yoffset)
 }
 
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)


@@ -547,31 +589,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)
 {

-    COLORREF colFgOld = 0,
-             colBgOld = 0;
-
-    if ( m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
-    {
-        colFgOld = ::GetTextColor(GetHdc());
-        colBgOld = ::GetBkColor(GetHdc());
-
-        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() )
-        {
-            // 0 in mask becomes text color
-            ::SetTextColor(GetHdc(), m_textBackgroundColour.GetPixel());
-        }
-
-        // VZ: IMHO this does strictly nothing here
-        SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
-                                                              : OPAQUE);
-    }
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
     wxCoord x2 = x + width;
     wxCoord y2 = y + height;
 
     wxCoord x2 = x + width;
     wxCoord y2 = y + height;


@@ -589,7 +607,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord 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
     {
         // 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
+        // to have the same size regardless of which pen is used - adjust

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


@@ -598,24 +616,18 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
             y2++;
         }
 
             y2++;
         }
 

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

     }
 
 
     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(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
 }
 
 void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {

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

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


@@ -650,6 +662,8 @@ 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)
 {

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

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


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

-    wxCoord x2 = (x+w);
-    wxCoord y2 = (y+h);
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    wxCoord x2 = x + w;
+    wxCoord y2 = y + h;

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


@@ -680,20 +696,22 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
 
     // 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

-    HPEN orig_pen = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
+    HPEN hpenOld = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));

     if (m_signY > 0)
     {
         (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
     if (m_signY > 0)
     {
         (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,

-            rx1, ry1, rx2, ry2);
+                  rx1, ry1, rx2, ry2);

     }
     else
     {
         (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
     }
     else
     {
         (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),

-            rx1, ry1-1, rx2, ry2-1);
+                  rx1, ry1-1, rx2, ry2-1);

     }
     }

-    ::SelectObject(GetHdc(), orig_pen);
+
+    ::SelectObject(GetHdc(), hpenOld);
+

     (void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
     (void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),

-        rx1, ry1, rx2, ry2);
+              rx1, ry1, rx2, ry2);

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


@@ -703,7 +721,11 @@ void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 {
     wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
 
 {
     wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
 

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

     ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));
     ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));

+#endif

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


@@ -817,7 +839,7 @@ void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
     if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                    text.c_str(), text.length()) == 0 )
     {
     if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                    text.c_str(), text.length()) == 0 )
     {

-        wxLogLastError("TextOut");
+        wxLogLastError(wxT("TextOut"));

     }
 
     // restore the old parameters (text foreground colour may be left because
     }
 
     // restore the old parameters (text foreground colour may be left because


@@ -850,7 +872,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
         {
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
         {

-            wxLogLastError("GetObject(hfont)");
+            wxLogLastError(wxT("GetObject(hfont)"));

         }
 
         // GDI wants the angle in tenth of degree
         }
 
         // GDI wants the angle in tenth of degree


@@ -861,7 +883,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
         hfont = ::CreateFontIndirect(&lf);
         if ( !hfont )
         {
         hfont = ::CreateFontIndirect(&lf);
         if ( !hfont )
         {

-            wxLogLastError("CreateFont");
+            wxLogLastError(wxT("CreateFont"));

         }
         else
         {
         }
         else
         {


@@ -1014,7 +1036,23 @@ void wxDC::SetBrush(const wxBrush& brush)
 
     if (m_brush.Ok())
     {
 
     if (m_brush.Ok())
     {

-        if (m_brush.GetResourceHandle())
+        // to make sure the brush is alligned with the logical coordinates
+        wxBitmap *stipple = m_brush.GetStipple();
+        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 ( m_brush.GetResourceHandle() )

         {
             HBRUSH b = 0;
             b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());
         {
             HBRUSH b = 0;
             b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());


@@ -1421,14 +1459,14 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
                            GetHdc(), xdest, ydest, SRCCOPY) )
             {
             if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
                            GetHdc(), xdest, ydest, SRCCOPY) )
             {

-                wxLogLastError("BitBlt");
+                wxLogLastError(wxT("BitBlt"));

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

-                wxLogLastError("BitBlt");
+                wxLogLastError(wxT("BitBlt"));

             }
 
             // set masked area in buffer to BLACK (pixel value 0)
             }
 
             // set masked area in buffer to BLACK (pixel value 0)


@@ -1437,7 +1475,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
                            dc_mask, xsrc, ysrc, SRCAND) )
             {
             if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
                            dc_mask, xsrc, ysrc, SRCAND) )
             {

-                wxLogLastError("BitBlt");
+                wxLogLastError(wxT("BitBlt"));

             }
 
             // set unmasked area in dest to BLACK
             }
 
             // set unmasked area in dest to BLACK


@@ -1446,7 +1484,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
                            dc_mask, xsrc, ysrc, SRCAND) )
             {
             if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
                            dc_mask, xsrc, ysrc, SRCAND) )
             {

-                wxLogLastError("BitBlt");
+                wxLogLastError(wxT("BitBlt"));

             }
             ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
             ::SetTextColor(GetHdc(), prevCol);
             }
             ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
             ::SetTextColor(GetHdc(), prevCol);


@@ -1457,7 +1495,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                                dc_buffer, 0, 0, SRCPAINT) != 0;
             if ( !success )
             {
                                dc_buffer, 0, 0, SRCPAINT) != 0;
             if ( !success )
             {

-                wxLogLastError("BitBlt");
+                wxLogLastError(wxT("BitBlt"));

             }
 
             // tidy up temporary DCs and bitmap
             }
 
             // tidy up temporary DCs and bitmap


@@ -1475,7 +1513,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                            GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
         if ( !success )
         {
                            GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
         if ( !success )
         {

-            wxLogLastError("BitBlt");
+            wxLogLastError(wxT("BitBlt"));

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