#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#include "wx/image.h"
+ #include "wx/sizer.h"
#endif
#include "wx/notebook.h"
// wxWin macros
// ----------------------------------------------------------------------------
-#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()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-#endif
-
// ============================================================================
// implementation
// ============================================================================
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;
}
styleWin |= BS_GROUPBOX;
wxSize wxStaticBox::DoGetBestSize() const
{
+ wxSize best;
+
+ // Calculate the size needed by the label
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
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;
}
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);
}
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
wxUxThemeHandle hTheme(this, L"BUTTON");
if ( hTheme )
{
- // GetThemeFont() expects its parameter to be LOGFONTW and not
- // LOGFONTA even in ANSI programs and will happily corrupt
- // memory after the struct end if we pass a LOGFONTA (which is
- // smaller) to it!
- LOGFONTW lfw;
+ wxUxThemeFont themeFont;
if ( wxUxThemeEngine::Get()->GetThemeFont
(
hTheme,
BP_GROUPBOX,
GBS_NORMAL,
TMT_FONT,
- (LOGFONT *)&lfw
+ themeFont.GetPtr()
) == S_OK )
{
-#if wxUSE_UNICODE
- // ok, no conversion necessary
- const LOGFONT& lf = lfw;
-#else // !wxUSE_UNICODE
- // most of the fields are the same in LOGFONTA and LOGFONTW
- LOGFONT lf;
- memcpy(&lf, &lfw, sizeof(lf));
-
- // but the face name must be converted
- WideCharToMultiByte(CP_ACP, 0, lfw.lfFaceName, -1,
- lf.lfFaceName, sizeof(lf.lfFaceName),
- NULL, NULL);
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
- font.Init(lf);
+ font.Init(themeFont.GetLOGFONT());
if ( font )
selFont.Init(hdc, font);
}
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.wx_str(), label.length(), &rc2,
- DT_SINGLELINE | DT_VCENTER);
+ ::DrawText(hdc, label.t_str(), label.length(), &rc2,
+ drawTextFlags);
}
else // RTL
{
RECT rc2 = { x, 0, x - width, y };
- ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
- DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
+ ::DrawText(hdc, label.t_str(), label.length(), &rc2,
+ drawTextFlags | DT_RTLREADING);
}
}
+#endif // wxUSE_UXTHEME
}
void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
projects / wxWidgets.git / blobdiff