Restored scrollbar background

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

diff --git a/include/wx/msw/csquery.bmp b/include/wx/msw/csquery.bmp
index 7a635552680f00d50acf7ca2e7a3efbf03f1e31f..4e7bcdc30b27a8a0e6bb783100bc1487d21d5f0f 100644 (file)
Binary files a/include/wx/msw/csquery.bmp and b/include/wx/msw/csquery.bmp differ

diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 719576135ab4b24281a813cf3224f29801756770..4f45dc975bceb1ac0d9bc9aca6e84ed3482d01a6 100644 (file)
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -59,6 +59,7 @@ public:
 
 protected:
 
+    virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
     wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 421e47578b048d800f88e57884110952e3f66a47..48e10b9d713337fa493f96172411cb6f054ce820 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -344,4 +344,16 @@ WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
+WXHBRUSH wxScrollBar::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
+{
+    HDC hdc = (HDC)pDC;
+    if ( m_hasFgCol )
+    {
+        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+    }
+
+    WXHBRUSH hbr = 0;
+    return hbr;
+}
+
 #endif // wxUSE_SCROLLBAR