X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58385af01650f2218cff7d64b58140a8aafdf8e0..2b9a7d4cc2f5f55df3d83f7cf2160cf9a509a4f2:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index cd21abe857..deb7761c26 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -38,15 +38,11 @@ #include "wx/statbox.h" #include "wx/notebook.h" #include "wx/sysopt.h" +#include "wx/image.h" +#include "wx/dcmemory.h" #include "wx/msw/private.h" -// under CE this style is not defined but we don't need to make static boxes -// transparent there neither -#ifndef WS_EX_TRANSPARENT - #define WS_EX_TRANSPARENT 0 -#endif - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -125,6 +121,8 @@ bool wxStaticBox::Create(wxWindow *parent, if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) ) return false; + Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint)); + return true; } @@ -132,8 +130,12 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const { long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle); + // no need for it anymore, must be removed for wxRadioBox child + // buttons to be able to repaint themselves + styleWin &= ~WS_CLIPCHILDREN; + if ( exstyle ) - *exstyle = WS_EX_TRANSPARENT; + *exstyle = 0; return styleWin | BS_GROUPBOX; } @@ -194,5 +196,149 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const #endif // !wxDIALOG_UNIT_COMPATIBILITY } +// MSWGetRegionWithoutSelf helper: removes the given rectangle from region +static inline void +SubtractRectFromRgn(HRGN hrgn, int left, int top, int right, int bottom) +{ + AutoHRGN hrgnRect(::CreateRectRgn(left, top, right, bottom)); + if ( !hrgnRect ) + { + wxLogLastError(_T("CreateRectRgn()")); + return; + } + + ::CombineRgn(hrgn, hrgn, hrgnRect, RGN_DIFF); +} + +void wxStaticBox::MSWGetRegionWithoutSelf(WXHRGN hRgn, int w, int h) +{ + HRGN hrgn = (HRGN)hRgn; + + // remove the area occupied by the static box borders from the region + int borderTop, border; + GetBordersForSizer(&borderTop, &border); + + // top + SubtractRectFromRgn(hrgn, 0, 0, w, borderTop); + + // bottom + SubtractRectFromRgn(hrgn, 0, h - border, w, h); + + // left + SubtractRectFromRgn(hrgn, 0, 0, border, h); + + // right + SubtractRectFromRgn(hrgn, w - border, 0, w, h); +} + +WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() +{ + RECT rc; + ::GetWindowRect(GetHwnd(), &rc); + HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); + + // 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); + + // 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) ) + { + // 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); + } + } + } + + return (WXHRGN)hrgn; +} + +// helper for OnPaint() +void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc) +{ + HBRUSH hbr = (HBRUSH)DoMSWControlColor(GetHdcOf(dc), wxNullColour); + if ( !hbr ) + { + wxBrush * + brush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour()); + if ( brush ) + hbr = GetHbrushOf(*brush); + } + + if ( hbr ) + ::FillRect(GetHdcOf(dc), &rc, hbr); +} + +void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) +{ + wxPaintDC dc(this); + RECT rc; + ::GetClientRect(GetHwnd(), &rc); + + // draw the entire box in a memory DC, but only blit the bits not redrawn + // either by our children windows nor by FillRect() painting the background + // below + wxMemoryDC memdc; + wxBitmap bitmap(rc.right, rc.bottom); + memdc.SelectObject(bitmap); + + PaintBackground(memdc, rc); + MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(memdc), 0); + + int borderTop, border; + GetBordersForSizer(&borderTop, &border); + + // top + dc.Blit(border, 0, rc.right - border, borderTop, + &memdc, border, 0); + // bottom + dc.Blit(border, rc.bottom - border, rc.right - border, rc.bottom, + &memdc, border, rc.bottom - border); + // left + dc.Blit(0, 0, border, rc.bottom, + &memdc, 0, 0); + // right + dc.Blit(rc.right - border, 0, rc.right, rc.bottom, + &memdc, rc.right - border, 0); + + AutoHRGN hrgn((HRGN)MSWGetRegionWithoutChildren()); + RECT rcWin; + ::GetWindowRect(GetHwnd(), &rcWin); + ::OffsetRgn(hrgn, -rcWin.left, -rcWin.top); + + + // now remove the box itself + MSWGetRegionWithoutSelf((WXHRGN) hrgn, rc.right, rc.bottom); + + // and paint the inside of the box (excluding child controls) + ::SelectClipRgn(GetHdcOf(dc), hrgn); + PaintBackground(dc, rc); + ::SelectClipRgn(GetHdcOf(dc), NULL); +} + #endif // wxUSE_STATBOX