#include "wx/msw/uxtheme.h"
#include "wx/msw/private.h"
#include "wx/msw/missing.h"
+#include "wx/msw/dc.h"
+
+// the values coincide with those in tmschema.h
+#define BP_GROUPBOX 4
+
+#define GBS_NORMAL 1
+
+#define TMT_FONT 210
// ----------------------------------------------------------------------------
// wxWin macros
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));
return true;
}
-wxBorder wxStaticBox::GetDefaultBorder() const
-{
- return wxBORDER_NONE;
-}
-
WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
{
long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
*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
wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
int wBox;
- GetTextExtent(wxStripMenuCodes(wxGetWindowText(m_hWnd)), &wBox, &cy);
+ GetTextExtent(GetLabelText(wxGetWindowText(m_hWnd)), &wBox, &cy);
wBox += 3*cx;
int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
AutoHRGN hrgnRect(::CreateRectRgn(left, top, right, bottom));
if ( !hrgnRect )
{
- wxLogLastError(_T("CreateRectRgn()"));
+ wxLogLastError(wxT("CreateRectRgn()"));
return;
}
// 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 = (HBRUSH)parent->MSWGetBgBrush(impl->GetHDC(), GetHWND());
// if there is no special brush for painting this control, just use the
// solid background colour
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);
// 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 ( wxUxThemeEngine::GetIfActive() )
+ if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() )
{
// draw over the text in default colour in our colour
- dc.SetFont(GetFont());
+ HDC hdc = GetHdcOf(*impl);
+ ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+
+ const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
+ if ( rtl )
+ ::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT);
- HDC hdc = GetHdcOf(dc);
- if ( m_hasFgCol )
+ // Get dimensions of the label
+ const wxString label = GetLabel();
+
+ // choose the correct font
+ AutoHFONT font;
+ SelectInHDC selFont;
+ if ( m_hasFont )
{
- ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+ selFont.Init(hdc, GetHfontOf(GetFont()));
}
- else
+ else // no font set, use the one set by the theme
{
wxUxThemeHandle hTheme(this, L"BUTTON");
- if (hTheme)
+ if ( hTheme )
{
- COLORREF col;
- wxUxThemeEngine::Get()->GetThemeColor(
- hTheme,
- 4 /* BP_GROUPBOX */,
- 1 /* GBS_NORMAL */,
- 3803 /* TMT_TEXTCOLOR */,
- &col);
-
- ::SetTextColor(hdc, col);
- }
- else
- {
- // can't open the theme - default to blue
- ::SetTextColor(hdc, 0x00D54600);
+ // 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;
+ if ( wxUxThemeEngine::Get()->GetThemeFont
+ (
+ hTheme,
+ hdc,
+ BP_GROUPBOX,
+ GBS_NORMAL,
+ TMT_FONT,
+ (LOGFONT *)&lfw
+ ) == 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);
+ if ( font )
+ selFont.Init(hdc, font);
+ }
}
}
- // FIXME: value of x is hardcoded as this is what it is on my system,
- // no idea if it's true everywhere
- // TODO: RTL?
- const int x = 9;
- const int y = dc.GetCharHeight();
- const wxString label = GetLabel();
+ // 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
- RECT rc = { x, 0, GetSize().x, y };
- ::DrawText(hdc, label, label.length(), &rc,
- DT_SINGLELINE | DT_VCENTER | DT_CALCRECT);
+ //
+ // FIXME: value of x is hardcoded as this is what it is on my system,
+ // no idea if it's true everywhere
+ 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;
+ }
// need to adjust the rectangle to cover all the label background
- rc.left -= 2;
- rc.right += 2;
- rc.bottom += 2;
- PaintBackground(dc, rc);
+ dimensions.left -= 2;
+ dimensions.right += 2;
+ dimensions.bottom += 2;
+
+ 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);
+ }
// now draw the text
- RECT rc2 = { x, 0, GetSize().x, y };
- ::DrawText(hdc, label, label.length(), &rc2,
- DT_SINGLELINE | DT_VCENTER);
+ if ( !rtl )
+ {
+ RECT rc2 = { x, 0, x + width, y };
+ ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
+ DT_SINGLELINE | DT_VCENTER);
+ }
+ else // RTL
+ {
+ RECT rc2 = { x, 0, x - width, y };
+ ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
+ DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
+ }
}
}
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
// 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);
projects / wxWidgets.git / blobdiff