X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72a55896e5bdf4ac03006fd280194afa1fd88cc1..cdbd62d6ff290fd58acd1bc5574dfc79db3a6f70:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 04d9874b6b..678a2594cf 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/statbox.cpp +// Name: src/msw/statbox.cpp // Purpose: wxStaticBox // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,10 +16,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" @@ -30,77 +25,34 @@ #if wxUSE_STATBOX +#include "wx/statbox.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/dcmemory.h" + #include "wx/image.h" + #include "wx/sizer.h" #endif -#include "wx/statbox.h" #include "wx/notebook.h" #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" +#include "wx/msw/dc.h" -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- +// the values coincide with those in tmschema.h +#define BP_GROUPBOX 4 -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxStaticBoxStyle ) - -wxBEGIN_FLAGS( wxStaticBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - -wxEND_FLAGS( wxStaticBoxStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h") - -wxBEGIN_PROPERTIES_TABLE(wxStaticBox) - wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -/* - TODO PROPERTIES : - label -*/ -wxEND_PROPERTIES_TABLE() +#define GBS_NORMAL 1 -wxBEGIN_HANDLERS_TABLE(wxStaticBox) -wxEND_HANDLERS_TABLE() +#define TMT_FONT 210 -wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) -#else -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) -#endif +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- // ============================================================================ // implementation @@ -124,19 +76,23 @@ bool wxStaticBox::Create(wxWindow *parent, if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) ) return false; + // Always use LTR layout. Otherwise, the label would be mirrored. + SetLayoutDirection(wxLayout_LeftToRight); + #ifndef __WXWINCE__ if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) + { Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint)); + + // Our OnPaint() completely erases our background, so don't do it in + // WM_ERASEBKGND too to avoid flicker. + SetBackgroundStyle(wxBG_STYLE_PAINT); + } #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); @@ -148,29 +104,55 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const if ( exstyle ) { #ifndef __WXWINCE__ + // We may have children inside this static box, so use this style for + // TAB navigation to work if we ever use IsDialogMessage() to implement + // it (currently we don't because it's too buggy and implement TAB + // navigation ourselves, but this could change in the future). + *exstyle |= WS_EX_CONTROLPARENT; + if (wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) - *exstyle = WS_EX_TRANSPARENT; - else + *exstyle |= WS_EX_TRANSPARENT; #endif - *exstyle = 0; } - return styleWin | BS_GROUPBOX; + styleWin |= BS_GROUPBOX; + + if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) + { + // Make sure label is on the right + styleWin |= BS_RIGHT; + } + + return styleWin; } wxSize wxStaticBox::DoGetBestSize() const { + wxSize best; + + // Calculate the size needed by the label int cx, cy; wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); int wBox; - GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy); + GetTextExtent(GetLabelText(wxGetWindowText(m_hWnd)), &wBox, &cy); wBox += 3*cx; int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); - wxSize best(wBox, hBox); - CacheBestSize(best); + // If there is a sizer then the base best size is the sizer's minimum + if (GetSizer() != NULL) + { + wxSize cm(GetSizer()->CalcMin()); + best = ClientToWindowSize(cm); + // adjust for a long label if needed + best.x = wxMax(best.x, wBox); + } + // otherwise the best size falls back to the label size + else + { + best = wxSize(wBox, hBox); + } return best; } @@ -209,6 +191,42 @@ 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; + } + + if ( nMsg == WM_UPDATEUISTATE ) + { + // DefWindowProc() redraws just the static box text when it gets this + // message and it does it using the standard (blue in standard theme) + // colour and not our own label colour that we use in PaintForeground() + // resulting in the label mysteriously changing the colour when e.g. + // "Alt" is pressed anywhere in the window, see #12497. + // + // To avoid this we simply refresh the window forcing our own code + // redrawing the label in the correct colour to be called. This is + // inefficient but there doesn't seem to be anything else we can do. + // + // Notice that the problem is XP-specific and doesn't arise under later + // systems. + if ( m_hasFgCol && wxGetWinVersion() == wxWinVersion_XP ) + Refresh(); + } + return wxControl::MSWWindowProc(nMsg, wParam, lParam); } @@ -231,7 +249,7 @@ SubtractRectFromRgn(HRGN hrgn, int left, int top, int right, int bottom) AutoHRGN hrgnRect(::CreateRectRgn(left, top, right, bottom)); if ( !hrgnRect ) { - wxLogLastError(_T("CreateRectRgn()")); + wxLogLastError(wxT("CreateRectRgn()")); return; } @@ -264,9 +282,16 @@ 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); + // Iterate over all sibling windows as in the old wxWidgets API the + // controls appearing inside the static box were created as its siblings + // and not children. This is now deprecated but should still work. + // + // Also notice that we must iterate over all windows, not just all + // wxWindows, as there may be composite windows etc. + HWND child; + for ( child = ::GetWindow(GetHwndOf(GetParent()), GW_CHILD); child; child = ::GetWindow(child, GW_HWNDNEXT) ) { @@ -275,19 +300,26 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() // 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 ) { - // 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; + 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; } - + ::GetWindowRect(child, &rc); if ( ::RectInRegion(hrgn, &rc) ) { @@ -297,7 +329,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() { 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." @@ -311,6 +343,23 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren() } } + // Also iterate over all children of the static box, we need to clip them + // out as well. + for ( child = ::GetWindow(GetHwnd(), GW_CHILD); + child; + child = ::GetWindow(child, GW_HWNDNEXT) ) + { + if ( !::IsWindowVisible(child) ) + { + // if the window isn't visible then it doesn't need clipped + continue; + } + + ::GetWindowRect(child, &rc); + AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc)); + ::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF); + } + return (WXHRGN)hrgn; } @@ -327,25 +376,27 @@ void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc) // 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()); + wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); + HBRUSH hbr = MSWGetBgBrush(impl->GetHDC()); // if there is no special brush for painting this control, just use the // solid background colour wxBrush brush; if ( !hbr ) { - brush = wxBrush(parent->GetBackgroundColour()); + brush = wxBrush(GetParent()->GetBackgroundColour()); hbr = GetHbrushOf(brush); } - ::FillRect(GetHdcOf(dc), &rc, hbr); + ::FillRect(GetHdcOf(*impl), &rc, hbr); } -void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc)) +void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) { - MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(dc), 0); + 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 @@ -353,22 +404,121 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc)) if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() ) { // draw over the text in default colour in our colour - dc.SetFont(GetFont()); - - HDC hdc = GetHdcOf(dc); + HDC hdc = GetHdcOf(*impl); ::SetTextColor(hdc, GetForegroundColour().GetPixel()); + const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft; + if ( rtl ) + ::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT); + + // Get dimensions of the label + const wxString label = GetLabel(); + + // choose the correct font + AutoHFONT font; + SelectInHDC selFont; + if ( m_hasFont ) + { + selFont.Init(hdc, GetHfontOf(GetFont())); + } + else // no font set, use the one set by the theme + { + wxUxThemeHandle hTheme(this, L"BUTTON"); + if ( hTheme ) + { + wxUxThemeFont themeFont; + if ( wxUxThemeEngine::Get()->GetThemeFont + ( + hTheme, + hdc, + BP_GROUPBOX, + GBS_NORMAL, + TMT_FONT, + themeFont.GetPtr() + ) == S_OK ) + { + font.Init(themeFont.GetLOGFONT()); + if ( font ) + selFont.Init(hdc, font); + } + } + } + + // Get the font extent + int width, height; + dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics), + &width, &height); + + int x; + int y = height; + + // first we need to correctly paint the background of the label + // as Windows ignores the brush offset when doing it + // // 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; + RECT dimensions = {0, 0, 0, y}; + if ( !rtl ) + { + x = 9; + dimensions.left = x; + dimensions.right = x + width; + } + else + { + x = rc.right - 7; + dimensions.left = x - width; + dimensions.right = x; + } - // TODO: RTL? - RECT rc = { x, 0, GetSize().x - x, y }; + // need to adjust the rectangle to cover all the label background + dimensions.left -= 2; + dimensions.right += 2; + dimensions.bottom += 2; - const wxString label = GetLabel(); - ::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER); + if ( UseBgCol() ) + { + // our own background colour should be used for the background of + // the label: this is consistent with the behaviour under pre-XP + // systems (i.e. without visual themes) and generally makes sense + wxBrush brush = wxBrush(GetBackgroundColour()); + wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); + ::FillRect(GetHdcOf(*impl), &dimensions, GetHbrushOf(brush)); + } + else // paint parent background + { + PaintBackground(dc, dimensions); + } + + UINT drawTextFlags = DT_SINGLELINE | DT_VCENTER; + + // determine the state of UI queues to draw the text correctly under XP + // and later systems + static const bool isXPorLater = wxGetWinVersion() >= wxWinVersion_XP; + if ( isXPorLater ) + { + if ( ::SendMessage(GetHwnd(), WM_QUERYUISTATE, 0, 0) & + UISF_HIDEACCEL ) + { + drawTextFlags |= DT_HIDEPREFIX; + } + } + + // now draw the text + if ( !rtl ) + { + RECT rc2 = { x, 0, x + width, y }; + ::DrawText(hdc, label.t_str(), label.length(), &rc2, + drawTextFlags); + } + else // RTL + { + RECT rc2 = { x, 0, x - width, y }; + ::DrawText(hdc, label.t_str(), label.length(), &rc2, + drawTextFlags | DT_RTLREADING); + } } +#endif // wxUSE_UXTHEME } void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) @@ -398,14 +548,16 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.Blit(border, 0, rc.right - border, borderTop, &memdc, border, 0); // bottom - dc.Blit(border, rc.bottom - border, rc.right - border, rc.bottom, + dc.Blit(border, rc.bottom - border, rc.right - border, border, &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); + // right (note that upper and bottom right corners were already part of the + // first two blits so we shouldn't overwrite them here to avoi flicker) + dc.Blit(rc.right - border, borderTop, + border, rc.bottom - borderTop - border, + &memdc, rc.right - border, borderTop); // create the region excluding box children @@ -416,7 +568,8 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) // and also the box itself MSWGetRegionWithoutSelf((WXHRGN) hrgn, rc.right, rc.bottom); - HDCClipper clipToBg(GetHdcOf(dc), hrgn); + wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); + HDCClipper clipToBg(GetHdcOf(*impl), hrgn); // paint the inside of the box (excluding box itself and child controls) PaintBackground(dc, rc); @@ -425,4 +578,3 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) #endif // !__WXWINCE__ #endif // wxUSE_STATBOX -