/////////////////////////////////////////////////////////////////////////////
-// Name: msw/statbox.cpp
+// Name: src/msw/statbox.cpp
// Purpose: wxStaticBox
// Author: Julian Smart
// Modified by:
// 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"
#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"
#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"
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));
*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(wxGetWindowText(m_hWnd), &wBox, &cy);
+ GetTextExtent(GetLabelText(wxGetWindowText(m_hWnd)), &wBox, &cy);
wBox += 3*cx;
int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
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);
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);
::FillRect(GetHdcOf(dc), &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);
// 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() )
+ if ( wxUxThemeEngine::GetIfActive() )
{
// draw over the text in default colour in our colour
dc.SetFont(GetFont());
HDC hdc = GetHdcOf(dc);
- ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+ if ( m_hasFgCol )
+ {
+ ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+ }
+ else
+ {
+ wxUxThemeHandle hTheme(this, L"BUTTON");
+ 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);
+ }
+ }
// 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 bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
+ if ( rtl )
+ ::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT);
+ // Get dimensions of the label
const wxString label = GetLabel();
- ::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER);
+ 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 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
+ dimensions.left -= 2;
+ dimensions.right += 2;
+ dimensions.bottom += 2;
+ PaintBackground(dc, dimensions);
+
+ // now draw the text
+ if ( !rtl )
+ {
+ RECT rc2 = { x, 0, x + width, y };
+ ::DrawText(hdc, label, label.length(), &rc2,
+ DT_SINGLELINE | DT_VCENTER);
+ }
+ else // RTL
+ {
+ RECT rc2 = { x, 0, x - width, y };
+ ::DrawText(hdc, label, label.length(), &rc2,
+ DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
+ }
}
}
#endif // !__WXWINCE__
#endif // wxUSE_STATBOX
-
projects / wxWidgets.git / blobdiff