#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"
// ----------------------------------------------------------------------------
// wxWin macros
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;
if ( exstyle )
{
- // 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.
- wxWindow* p = GetParent();
- bool ancestorScrolls = false;
- while (p && !p->IsTopLevel())
- {
- if (p->HasFlag(wxVSCROLL) || GetParent()->HasFlag(wxHSCROLL))
- {
- ancestorScrolls = true;
- break;
- }
- p = p->GetParent();
- }
- if (ancestorScrolls)
+#ifndef __WXWINCE__
+ if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
*exstyle = WS_EX_TRANSPARENT;
else
+#endif
*exstyle = 0;
}
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
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) )
+ 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(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(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);
}
}
// 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(), this);
+ HBRUSH hbr = (HBRUSH)parent->MSWGetBgBrush(dc.GetHDC(), GetHWND());
// if there is no special brush for painting this control, just use the
// solid background colour
::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;
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
projects / wxWidgets.git / blobdiff