do case normalization after long path one, this fixes the problem with incorrect...

[wxWidgets.git] / src / motif / dcclient.cpp

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 2176913c624c387ab36d4ec3ebbefc786f7a5f7f..23e57a20b5856b5cf875b9f905defe36832e4efb 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1736,7 +1736,7 @@ void wxWindowDCImpl::SetPen( const wxPen &pen )
             pixel = m_backgroundPixel;
         else
         {
             pixel = m_backgroundPixel;
         else
         {

-            pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, false);
+            pixel = CalculatePixel( (wxColour&) m_pen.GetColour(), m_currentColour, false);

         }
 
         // Finally, set the GC to the required colour
         }
 
         // Finally, set the GC to the required colour


@@ -1898,7 +1898,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)
     {
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)
     {

-        WXPixel pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true);
+        WXPixel pixel = CalculatePixel( (wxColour&) m_brush.GetColour(), m_currentColour, true);

 
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
 
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);