X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72093cd889babd3a1ce12379528f3c5948af1ace..2fb18bf45bcf391a8eb973886072dc67893e9bbe:/src/msw/statbox.cpp?ds=sidebyside diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index e23f78abe1..829976e363 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -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" @@ -40,7 +36,9 @@ #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" #include "wx/msw/missing.h" @@ -123,7 +121,8 @@ bool wxStaticBox::Create(wxWindow *parent, return false; #ifndef __WXWINCE__ - Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint)); + if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) + Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint)); #endif // !__WXWINCE__ return true; @@ -144,23 +143,12 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const if ( exstyle ) { - *exstyle = 0; - - // If any of the ancestors are scrolling windows, style has to be - // WS_EX_TRANSPARENT or the static box won't be painted when the window - // is scrolled. We try not to do this normally, because we get a lot of - // flicker. - for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) - { - if ( win->HasFlag(wxVSCROLL) || win->HasFlag(wxHSCROLL) ) - { - *exstyle = WS_EX_TRANSPARENT; - break; - } - - if ( win->IsTopLevel() ) - break; - } +#ifndef __WXWINCE__ + if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) + *exstyle = WS_EX_TRANSPARENT; + else +#endif + *exstyle = 0; } return styleWin | BS_GROUPBOX; @@ -177,7 +165,9 @@ wxSize wxStaticBox::DoGetBestSize() const wBox += 3*cx; int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); - return wxSize(wBox, hBox); + wxSize best(wBox, hBox); + CacheBestSize(best); + return best; } void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const @@ -215,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); } @@ -270,41 +278,58 @@ 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); child; child = ::GetWindow(child, GW_HWNDNEXT) ) { - wxWindow *childWindow = wxGetWindowFromHWND((WXHWND) child); + if ( ! ::IsWindowVisible(child) ) + { + // 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 ) + { + 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; + } - // can't just test for (this != child) here since if a wxStaticBox - // overlaps another wxStaticBox then neither are drawn. The overlapping - // region will flicker but we shouldn't have overlapping windows anyway. - if ( !childWindow || !wxDynamicCast(childWindow, wxStaticBox) ) + ::GetWindowRect(child, &rc); + if ( ::RectInRegion(hrgn, &rc) ) { - ::GetWindowRect(child, &rc); - if ( ::RectInRegion(hrgn, &rc) ) + // need to remove WS_CLIPSIBLINGS from all sibling windows + // that are within this staticbox if set + if ( style & WS_CLIPSIBLINGS ) { - // need to remove WS_CLIPSIBLINGS from all sibling windows - // that are within this staticbox if set - LONG style = ::GetWindowLong(child, GWL_STYLE); - if ( style & WS_CLIPSIBLINGS ) - { - 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." - ::SetWindowPos(child, NULL, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | - SWP_FRAMECHANGED); - } - - AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc)); - ::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF); + 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." + ::SetWindowPos(child, NULL, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | + SWP_FRAMECHANGED); } + + AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc)); + ::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF); } } @@ -339,6 +364,35 @@ void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc) ::FillRect(GetHdcOf(dc), &rc, hbr); } +void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc)) +{ + MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(dc), 0); + + // when using XP themes, neither setting the text colour nor transparent + // 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() ) + { + // draw over the text in default colour in our colour + dc.SetFont(GetFont()); + + HDC hdc = GetHdcOf(dc); + ::SetTextColor(hdc, GetForegroundColour().GetPixel()); + + // 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 wxString label = GetLabel(); + ::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER); + } +} + void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) { RECT rc; @@ -350,13 +404,7 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) memdc.SelectObject(bitmap); PaintBackground(memdc, rc); - - // NB: neither setting the text colour nor transparent background mode - // doesn't change anything: the static box def window proc still - // draws the label in its own colours, so if we want to have control - // over this we really have to draw everything ourselves - MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(memdc), 0); - + PaintForeground(memdc, rc); // now only blit the static box border itself, not the interior, to avoid // flicker when background is drawn below