another GradientFillLinear fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 4264c85ae1f574bd041e34a52e12fecc735db77b..1475923953e7e33d1cd7aa74fc276bdb5d394b75 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -733,12 +733,14 @@ void wxDCBase::DoGradientFillLinear(const wxRect& rect,
             else
                 nB = nB1 + (nB2-nB1)*(w-x)/w;
 
             else
                 nB = nB1 + (nB2-nB1)*(w-x)/w;
 

-            SetPen(wxPen(wxColour(nR, nG, nB), 1, wxSOLID));
+           wxColour colour(nR,nG,nB);
+            SetPen(wxPen(colour, 1, wxSOLID));
+            SetBrush(wxBrush(colour));

             if(nDirection == wxEAST)
             if(nDirection == wxEAST)

-                DrawRectangle(rect.GetLeft()+x, rect.GetTop(),
+                DrawRectangle(rect.GetRight()-x-xDelta, rect.GetTop(),

                         xDelta, rect.GetHeight());
             else //nDirection == wxWEST
                         xDelta, rect.GetHeight());
             else //nDirection == wxWEST

-                DrawRectangle(rect.GetRight()-x-xDelta, rect.GetTop(),
+                DrawRectangle(rect.GetLeft()+x, rect.GetTop(),

                         xDelta, rect.GetHeight());
         }
     }
                         xDelta, rect.GetHeight());
         }
     }


@@ -768,7 +770,9 @@ void wxDCBase::DoGradientFillLinear(const wxRect& rect,
             else
                 nB = nB1 + (nB2-nB1)*(w-y)/w;
 
             else
                 nB = nB1 + (nB2-nB1)*(w-y)/w;
 

-            SetPen(wxPen(wxColour(nR, nG, nB), 1, wxSOLID));
+           wxColour colour(nR,nG,nB);
+            SetPen(wxPen(colour, 1, wxSOLID));
+            SetBrush(wxBrush(colour));

             if(nDirection == wxNORTH)
                 DrawRectangle(rect.GetLeft(), rect.GetTop()+y,
                         rect.GetWidth(), yDelta);
             if(nDirection == wxNORTH)
                 DrawRectangle(rect.GetLeft(), rect.GetTop()+y,
                         rect.GetWidth(), yDelta);