From 123865f20a601da4692ce808f69832cd808bf31d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 31 May 2005 14:40:34 +0000 Subject: [PATCH] Restored scrollbar background git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/csquery.bmp | Bin 206 -> 206 bytes include/wx/msw/scrolbar.h | 1 + src/msw/scrolbar.cpp | 12 ++++++++++++ 3 files changed, 13 insertions(+) diff --git a/include/wx/msw/csquery.bmp b/include/wx/msw/csquery.bmp index 7a635552680f00d50acf7ca2e7a3efbf03f1e31f..4e7bcdc30b27a8a0e6bb783100bc1487d21d5f0f 100644 GIT binary patch literal 206 zcmZ?rJ;wk6Wk5;;hp`#pkPX5hASfuvAR!^aprD|@U|?Xt z5EvN9kdTnTkeQjuP*G9A(9qDpFmd8Uh6M{2Fsxj;l3~M!4Gaek902Qm_wLlXckdV& w-n~oUL#1Kj1-uaPgUt89>Rubjfan&U3v3{I1Cs#n+a literal 206 zcmYj|u?>JQ3NO63A`|X_9tB40VV1)%H%~a`z z9mCn^oroflDkX$Ut6D4Si`G-Ec?UeVDAq%0PG+O}Vx0fIaf_c5#-RPy@8jPGr>8KF diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h index 719576135a..4f45dc975b 100644 --- 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 421e47578b..48e10b9d71 100644 --- 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 -- 2.50.0