X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72a55896e5bdf4ac03006fd280194afa1fd88cc1..f46ad98f0df1e1b073a484cb34a91e2e1278fdb7:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 04d9874b6b..b426f923e4 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/statbox.cpp +// Name: src/msw/statbox.cpp // Purpose: wxStaticBox // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "statbox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,17 +26,17 @@ #if wxUSE_STATBOX +#include "wx/statbox.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/dcmemory.h" + #include "wx/image.h" #endif -#include "wx/statbox.h" #include "wx/notebook.h" #include "wx/sysopt.h" -#include "wx/image.h" -#include "wx/dcmemory.h" -#include "wx/sysopt.h" #include "wx/msw/uxtheme.h" #include "wx/msw/private.h" @@ -164,7 +160,7 @@ wxSize wxStaticBox::DoGetBestSize() const wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); int wBox; - GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy); + GetTextExtent(GetLabelText(wxGetWindowText(m_hWnd)), &wBox, &cy); wBox += 3*cx; int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); @@ -209,6 +205,24 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar } } + if ( nMsg == WM_PRINTCLIENT ) + { + // we have to process WM_PRINTCLIENT ourselves as otherwise child + // windows' background (eg buttons in radio box) would never be drawn + // unless we have a parent with non default background + + // so check first if we have one + if ( !HandlePrintClient((WXHDC)wParam) ) + { + // no, we don't, erase the background ourselves + // (don't use our own) - see PaintBackground for explanation + wxBrush brush(GetParent()->GetBackgroundColour()); + wxFillRect(GetHwnd(), (HDC)wParam, GetHbrushOf(brush)); + } + + return 0; + } + return wxControl::MSWWindowProc(nMsg, wParam, lParam); } @@ -264,6 +278,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() RECT rc; ::GetWindowRect(GetHwnd(), &rc); HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); + bool foundThis = false; // iterate over all child windows (not just wxWindows but all windows) for ( HWND child = ::GetWindow(GetHwndOf(GetParent()), GW_CHILD); @@ -275,19 +290,26 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() // if the window isn't visible then it doesn't need clipped continue; } - + LONG style = ::GetWindowLong(child, GWL_STYLE); wxString str(wxGetWindowClass(child)); str.UpperCase(); if ( str == wxT("BUTTON") && (style & BS_GROUPBOX) == BS_GROUPBOX ) { - // Don't clip any static boxes, not just this one. This will - // result in flicker in overlapping static boxes, but at least - // they will all be drawn correctly and we shouldn't have - // overlapping windows anyway. - continue; + if ( child == GetHwnd() ) + foundThis = true; + + // Any static boxes below this one in the Z-order can't be clipped + // since if we have the case where a static box with a low Z-order + // is nested inside another static box with a high Z-order then the + // nested static box would be painted over. Doing it this way + // unfortunately results in flicker if the Z-order of nested static + // boxes is not inside (lowest) to outside (highest) but at least + // they are still shown. + if ( foundThis ) + continue; } - + ::GetWindowRect(child, &rc); if ( ::RectInRegion(hrgn, &rc) ) { @@ -297,7 +319,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() { style &= ~WS_CLIPSIBLINGS; ::SetWindowLong(child, GWL_STYLE, style); - + // MSDN: "If you have changed certain window data using // SetWindowLong, you must call SetWindowPos to have the // changes take effect." @@ -350,24 +372,61 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc)) // background mode doesn't change anything: the static box def window proc // still draws the label in its own colours, so we need to redraw the text // ourselves if we have a non default fg colour - if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() ) + if ( wxUxThemeEngine::GetIfActive() ) { // draw over the text in default colour in our colour dc.SetFont(GetFont()); HDC hdc = GetHdcOf(dc); - ::SetTextColor(hdc, GetForegroundColour().GetPixel()); + if ( m_hasFgCol ) + { + ::SetTextColor(hdc, GetForegroundColour().GetPixel()); + } + else + { + wxUxThemeHandle hTheme(this, L"BUTTON"); + if (hTheme) + { + COLORREF col; + wxUxThemeEngine::Get()->GetThemeColor( + hTheme, + 4 /* BP_GROUPBOX */, + 1 /* GBS_NORMAL */, + 3803 /* TMT_TEXTCOLOR */, + &col); + + ::SetTextColor(hdc, col); + } + else + { + // can't open the theme - default to blue + ::SetTextColor(hdc, 0x00D54600); + } + } // FIXME: value of x is hardcoded as this is what it is on my system, // no idea if it's true everywhere - const int y = dc.GetCharHeight(); - const int x = 9; - // TODO: RTL? - RECT rc = { x, 0, GetSize().x - x, y }; - + const int x = 9; + const int y = dc.GetCharHeight(); const wxString label = GetLabel(); - ::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER); + + // first we need to correctly paint the background of the label + // as Windows ignores the brush offset when doing it + RECT rc = { x, 0, GetSize().x, y }; + ::DrawText(hdc, label, label.length(), &rc, + DT_SINGLELINE | DT_VCENTER | DT_CALCRECT); + + // need to adjust the rectangle to cover all the label background + rc.left -= 2; + rc.right += 2; + rc.bottom += 2; + PaintBackground(dc, rc); + + // now draw the text + RECT rc2 = { x, 0, GetSize().x, y }; + ::DrawText(hdc, label, label.length(), &rc2, + DT_SINGLELINE | DT_VCENTER); } } @@ -425,4 +484,3 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) #endif // !__WXWINCE__ #endif // wxUSE_STATBOX -