Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge of RTL changes (with many modifications) from SOC2006_RTL branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-04 13:35:13 +00:00
parent ca8d899fcb
commit 978af86426
24 changed files with 946 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/msw/window.cpp
View File

@@ -1018,6 +1018,59 @@ bool wxWindowMSW::ScrollPages(int pages)
down ? pages : -pages);
}
// ----------------------------------------------------------------------------
// RTL support
// ----------------------------------------------------------------------------
void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
{
const HWND hwnd = GetHwnd();
wxCHECK_RET( hwnd, _T("layout direction must be set after window creation") );
LONG styleOld = ::GetWindowLong(hwnd, GWL_EXSTYLE);
LONG styleNew = styleOld;
switch ( dir )
{
case wxLayout_LeftToRight:
styleNew &= ~WS_EX_LAYOUTRTL;
break;
case wxLayout_RightToLeft:
styleNew |= WS_EX_LAYOUTRTL;
break;
default:
wxFAIL_MSG(_T("unsupported layout direction"));
break;
}
if ( styleNew != styleOld )
{
::SetWindowLong(hwnd, GWL_EXSTYLE, styleNew);
}
}
wxLayoutDirection wxWindowMSW::GetLayoutDirection() const
{
const HWND hwnd = GetHwnd();
wxCHECK_MSG( hwnd, wxLayout_Default, _T("invalid window") );
return ::GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL
? wxLayout_RightToLeft
: wxLayout_LeftToRight;
}
wxCoord
wxWindowMSW::AdjustForLayoutDirection(wxCoord x,
wxCoord WXUNUSED(width),
wxCoord WXUNUSED(widthTotal)) const
{
// Win32 mirrors the coordinates of RTL windows automatically, so don't
// redo it ourselves
return x;
}
// ---------------------------------------------------------------------------
// subclassing
// ---------------------------------------------------------------------------