From 4dab527961dca568517f15fabe2f54961aba835d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 27 Apr 2005 15:32:11 +0000 Subject: [PATCH] Fix for radiobox controls backgrounds being drawn incorrectly on an unthemed (solid colour) wxNotebook git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/notebook.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 925dee0c9a..c8663ee71d 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -1116,6 +1116,29 @@ bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child) if ( !UseBgCol() && DoDrawBackground(hDC, child) ) return true; + // If we're using a solid colour (for example if we've switched off + // theming for this notebook), paint it + if (UseBgCol()) + { + wxRect r = GetPageSize(); + if ( r.IsEmpty() ) + return false; + + RECT rc; + wxCopyRectToRECT(r, rc); + + // map rect to the coords of the window we're drawing in + if ( child ) + ::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2); + + wxBrush brush(GetBackgroundColour()); + HBRUSH hbr = GetHbrushOf(brush); + + ::FillRect((HDC) hDC, &rc, hbr); + + return true; + } + return wxNotebookBase::MSWPrintChild(hDC, child); } -- 2.45.2