X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18717b27d61be93b3357fc5c374f8c14e38fd794..083ec26fb723d360851f2842ffb5fb3c65a8797b:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 3bd2e55081..d3e6b3cd3a 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -364,6 +364,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0); +#if wxUSE_UXTHEME // 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 @@ -485,6 +486,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) drawTextFlags | DT_RTLREADING); } } +#endif // wxUSE_UXTHEME } void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) @@ -543,26 +545,4 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) #endif // !__WXWINCE__ - -wxPoint wxStaticBox::GetClientAreaOrigin() const -{ - // See: http://msdn.microsoft.com/en-us/library/aa511279.aspx - wxPoint pt = ConvertDialogToPixels(wxPoint(6,11)); - return pt; -} - - -void wxStaticBox::DoGetClientSize(int *width, int *height) const -{ - // See: http://msdn.microsoft.com/en-us/library/aa511279.aspx - wxPoint lr = ConvertDialogToPixels(wxPoint(6,7)); - wxPoint ul = GetClientAreaOrigin(); - wxSize sz = GetSize(); - - if (width) - *width = sz.x - ul.x - lr.x; - if (height) - *height = sz.y - ul.y - lr.x; -} - #endif // wxUSE_STATBOX