X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f059e30a1de9f4416d39e7747a6cdd6e39c6c30..3db799025def6081154db09b3ba3d771f741d91b:/src/msw/statbox.cpp?ds=sidebyside diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index ea27a85d60..88e485e64b 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -40,8 +40,10 @@ #include "wx/sysopt.h" #include "wx/image.h" #include "wx/dcmemory.h" +#include "wx/sysopt.h" #include "wx/msw/private.h" +#include "wx/msw/missing.h" // ---------------------------------------------------------------------------- // wxWin macros @@ -99,10 +101,6 @@ wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) #endif -BEGIN_EVENT_TABLE(wxStaticBox, wxControl) - EVT_PAINT(wxStaticBox::OnPaint) -END_EVENT_TABLE() - // ============================================================================ // implementation // ============================================================================ @@ -125,9 +123,19 @@ bool wxStaticBox::Create(wxWindow *parent, if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) ) return false; +#ifndef __WXWINCE__ + if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) + Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint)); +#endif // !__WXWINCE__ + return true; } +wxBorder wxStaticBox::GetDefaultBorder() const +{ + return wxBORDER_NONE; +} + WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const { long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle); @@ -137,7 +145,12 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const styleWin &= ~WS_CLIPCHILDREN; if ( exstyle ) - *exstyle = 0; + { + if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) + *exstyle = WS_EX_TRANSPARENT; + else + *exstyle = 0; + } return styleWin | BS_GROUPBOX; } @@ -156,9 +169,19 @@ wxSize wxStaticBox::DoGetBestSize() const return wxSize(wBox, hBox); } -WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const { + wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther); + + // need extra space, don't know how much but this seems to be enough + *borderTop += GetCharHeight()/3; +} + +// all the hacks below are not necessary for WinCE #ifndef __WXWINCE__ + +WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ if ( nMsg == WM_NCHITTEST ) { // This code breaks some other processing such as enter/leave tracking @@ -169,8 +192,8 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbox.htclient")); if (s_useHTClient == 1) { - int xPos = LOWORD(lParam); // horizontal position of cursor - int yPos = HIWORD(lParam); // vertical position of cursor + int xPos = GET_X_LPARAM(lParam); + int yPos = GET_Y_LPARAM(lParam); ScreenToClient(&xPos, &yPos); @@ -180,148 +203,201 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar return (long)HTCLIENT; } } -#endif // !__WXWINCE__ return wxControl::MSWWindowProc(nMsg, wParam, lParam); } -void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const +// ---------------------------------------------------------------------------- +// static box drawing +// ---------------------------------------------------------------------------- + +/* + We draw the static box ourselves because it's the only way to prevent it + from flickering horribly on resize (because everything inside the box is + erased twice: once when the box itself is repainted and second time when + the control inside it is repainted) without using WS_EX_TRANSPARENT style as + we used to do and which resulted in other problems. + */ + +// MSWGetRegionWithoutSelf helper: removes the given rectangle from region +static inline void +SubtractRectFromRgn(HRGN hrgn, int left, int top, int right, int bottom) { - wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther); + AutoHRGN hrgnRect(::CreateRectRgn(left, top, right, bottom)); + if ( !hrgnRect ) + { + wxLogLastError(_T("CreateRectRgn()")); + return; + } - // if not using correct (but backwards cojmpatible) text metrics - // calculations, we need to add some extra margin or otherwise static box - // title is clipped -#if !wxDIALOG_UNIT_COMPATIBILITY - if ( !GetLabel().empty() ) - *borderTop += GetCharHeight()/3; -#endif // !wxDIALOG_UNIT_COMPATIBILITY + ::CombineRgn(hrgn, hrgn, hrgnRect, RGN_DIFF); } -// rc must be in client coords! -void wxStaticBox::MSWClipBoxRegion(WXHRGN hrgn, const WXRECTPTR rc) +void wxStaticBox::MSWGetRegionWithoutSelf(WXHRGN hRgn, int w, int h) { - HRGN hrgnchild; + HRGN hrgn = (HRGN)hRgn; + + // remove the area occupied by the static box borders from the region + int borderTop, border; + GetBordersForSizer(&borderTop, &border); // top - hrgnchild = ::CreateRectRgn(0, 0, ((const RECT*) rc)->right, 14); - ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF); - ::DeleteObject(hrgnchild); + SubtractRectFromRgn(hrgn, 0, 0, w, borderTop); // bottom - hrgnchild = ::CreateRectRgn(0, ((const RECT*) rc)->bottom - 7, ((const RECT*) rc)->right, ((const RECT*) rc)->bottom); - ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF); - ::DeleteObject(hrgnchild); + SubtractRectFromRgn(hrgn, 0, h - border, w, h); // left - hrgnchild = ::CreateRectRgn(0, 0, 7, ((const RECT*) rc)->bottom); - ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF); - ::DeleteObject(hrgnchild); + SubtractRectFromRgn(hrgn, 0, 0, border, h); // right - hrgnchild = ::CreateRectRgn(((const RECT*) rc)->right - 7, 0, ((const RECT*) rc)->right, ((const RECT*) rc)->bottom); - ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF); - ::DeleteObject(hrgnchild); + SubtractRectFromRgn(hrgn, w - border, 0, w, h); } -WXHRGN wxStaticBox::MSWCalculateClippingRegion() +WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() { RECT rc; ::GetWindowRect(GetHwnd(), &rc); HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); - wxWindowList::compatibility_iterator node = GetParent()->GetChildren().GetFirst(); - while ( node ) + // 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 *child = node->GetData(); - - // 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 ( !child->IsKindOf(CLASSINFO(wxStaticBox)) ) + 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 ) { - ::GetWindowRect(GetHwndOf(child), &rc); - if ( RectInRegion(hrgn, &rc) ) + // 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; + } + + ::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(GetHwndOf(child), GWL_STYLE); - if ( style & WS_CLIPSIBLINGS ) - { - style &= ~WS_CLIPSIBLINGS; - ::SetWindowLong(GetHwndOf(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(GetHwndOf(child), NULL, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | - SWP_FRAMECHANGED); - } - - HRGN hrgnchild = ::CreateRectRgnIndirect(&rc); - ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF); - ::DeleteObject(hrgnchild); + 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); } + } + + return (WXHRGN)hrgn; +} - node = node->GetNext(); +// helper for OnPaint(): really erase the background, i.e. do it even if we +// don't have any non default brush for doing it (DoEraseBackground() doesn't +// do anything in such case) +void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc) +{ + // note that we do not use the box background colour here, it shouldn't + // apply to its interior for several reasons: + // 1. wxGTK doesn't do it + // 2. controls inside the box don't get correct bg colour because they + // are not our children so we'd have some really ugly colour mix if + // we did it + // 3. this is backwards compatible behaviour and some people rely on it, + // see http://groups.google.com/groups?selm=4252E932.3080801%40able.es + wxWindow *parent = GetParent(); + HBRUSH hbr = (HBRUSH)parent->MSWGetBgBrush(dc.GetHDC(), GetHWND()); + + // if there is no special brush for painting this control, just use the + // solid background colour + wxBrush brush; + if ( !hbr ) + { + brush = wxBrush(parent->GetBackgroundColour()); + hbr = GetHbrushOf(brush); } - ::GetWindowRect(GetHwnd(), &rc); - ::OffsetRgn(hrgn, -rc.left, -rc.top); - return hrgn; + ::FillRect(GetHdcOf(dc), &rc, hbr); +} + +void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(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(dc), 0); } void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) { - wxPaintDC dc(this); RECT rc; ::GetClientRect(GetHwnd(), &rc); - // paint the actual box + // draw the entire box in a memory DC wxMemoryDC memdc; wxBitmap bitmap(rc.right, rc.bottom); memdc.SelectObject(bitmap); - // get bg brush - WXHBRUSH hbr = DoMSWControlColor(GetHdcOf(memdc), wxNullColour); - if ( !hbr ) - { - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID); - hbr = (WXHBRUSH)brush->GetResourceHandle(); - } + PaintBackground(memdc, rc); + PaintForeground(memdc, rc); - // draw solid box, but only blit the good bits - ::FillRect(GetHdcOf(memdc), &rc, (HBRUSH)hbr); - MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(memdc), 0); + // now only blit the static box border itself, not the interior, to avoid + // flicker when background is drawn below + // + // note that it seems to be faster to do 4 small blits here and then paint + // directly into wxPaintDC than painting background in wxMemoryDC and then + // blitting everything at once to wxPaintDC, this is why we do it like this + wxPaintDC dc(this); + int borderTop, border; + GetBordersForSizer(&borderTop, &border); // top - dc.Blit(7, 0, rc.right - 7, 14, &memdc, 7, 0); + dc.Blit(border, 0, rc.right - border, borderTop, + &memdc, border, 0); // bottom - dc.Blit(7, rc.bottom - 7, rc.right - 7, rc.bottom, &memdc, 7, rc.bottom - 7); + dc.Blit(border, rc.bottom - border, rc.right - border, rc.bottom, + &memdc, border, rc.bottom - border); // left - dc.Blit(0, 0, 7, rc.bottom, &memdc, 0, 0); + dc.Blit(0, 0, border, rc.bottom, + &memdc, 0, 0); // right - dc.Blit(rc.right - 7, 0, rc.right, rc.bottom, &memdc, rc.right - 7, 0); + dc.Blit(rc.right - border, 0, rc.right, rc.bottom, + &memdc, rc.right - border, 0); - // paint the inner - HRGN hrgn = (HRGN)MSWCalculateClippingRegion(); - // now remove the box itself - MSWClipBoxRegion((WXHRGN) hrgn, (const WXRECTPTR) &rc); - hbr = DoMSWControlColor(GetHdcOf(dc), wxNullColour); - if ( !hbr ) - { - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID); - hbr = (WXHBRUSH)brush->GetResourceHandle(); - } + // create the region excluding box children + AutoHRGN hrgn((HRGN)MSWGetRegionWithoutChildren()); + RECT rcWin; + ::GetWindowRect(GetHwnd(), &rcWin); + ::OffsetRgn(hrgn, -rcWin.left, -rcWin.top); - ::SelectClipRgn(GetHdcOf(dc), hrgn); - ::FillRect(GetHdcOf(dc), &rc, (HBRUSH)hbr); - ::SelectClipRgn(GetHdcOf(dc), NULL); - ::DeleteObject(hrgn); + // and also the box itself + MSWGetRegionWithoutSelf((WXHRGN) hrgn, rc.right, rc.bottom); + HDCClipper clipToBg(GetHdcOf(dc), hrgn); + + // paint the inside of the box (excluding box itself and child controls) + PaintBackground(dc, rc); } +#endif // !__WXWINCE__ + #endif // wxUSE_STATBOX