WinCE build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -97,8 +97,10 @@ int wxMessageDialog::ShowModal()
|
||||
if ( wxStyle & wxSTAY_ON_TOP )
|
||||
msStyle |= MB_TOPMOST;
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
|
||||
msStyle |= MB_RTLREADING | MB_RIGHT;
|
||||
#endif
|
||||
|
||||
if (hWnd)
|
||||
msStyle |= MB_APPLMODAL;
|
||||
|
@@ -503,8 +503,10 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
|
||||
|
||||
const wxSize sz = IsAlwaysMaximized() ? wxDefaultSize : size;
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
|
||||
exflags |= WS_EX_LAYOUTRTL;
|
||||
#endif
|
||||
|
||||
return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
|
||||
}
|
||||
@@ -565,12 +567,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
|
||||
// all dialogs are popups
|
||||
dlgTemplate->style |= WS_POPUP;
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
|
||||
{
|
||||
dlgTemplate->dwExtendedStyle |= WS_EX_LAYOUTRTL;
|
||||
}
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
// force 3D-look if necessary, it looks impossibly ugly otherwise
|
||||
if ( style & (wxRESIZE_BORDER | wxCAPTION) )
|
||||
dlgTemplate->style |= DS_MODALFRAME;
|
||||
|
@@ -1024,6 +1024,9 @@ bool wxWindowMSW::ScrollPages(int pages)
|
||||
|
||||
void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
|
||||
{
|
||||
#ifdef __WXWINCE__
|
||||
wxUnusedVar(dir);
|
||||
#else
|
||||
const HWND hwnd = GetHwnd();
|
||||
wxCHECK_RET( hwnd, _T("layout direction must be set after window creation") );
|
||||
|
||||
@@ -1049,16 +1052,21 @@ void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
|
||||
{
|
||||
::SetWindowLong(hwnd, GWL_EXSTYLE, styleNew);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
wxLayoutDirection wxWindowMSW::GetLayoutDirection() const
|
||||
{
|
||||
#ifdef __WXWINCE__
|
||||
return wxLayout_Default;
|
||||
#else
|
||||
const HWND hwnd = GetHwnd();
|
||||
wxCHECK_MSG( hwnd, wxLayout_Default, _T("invalid window") );
|
||||
|
||||
return ::GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL
|
||||
? wxLayout_RightToLeft
|
||||
: wxLayout_LeftToRight;
|
||||
#endif
|
||||
}
|
||||
|
||||
wxCoord
|
||||
|
Reference in New Issue
Block a user