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

WinCE build fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-09-05 19:23:15 +00:00
parent 7d02e0d6e9
commit 08a5813350
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/msgdlg.cpp
View File

@@ -97,8 +97,10 @@ int wxMessageDialog::ShowModal()
if ( wxStyle & wxSTAY_ON_TOP ) if ( wxStyle & wxSTAY_ON_TOP )
msStyle |= MB_TOPMOST; msStyle |= MB_TOPMOST;
#ifndef __WXWINCE__
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
msStyle |= MB_RTLREADING | MB_RIGHT; msStyle |= MB_RTLREADING | MB_RIGHT;
#endif
if (hWnd) if (hWnd)
msStyle |= MB_APPLMODAL; msStyle |= MB_APPLMODAL;

4
src/msw/toplevel.cpp
View File

@@ -503,8 +503,10 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
const wxSize sz = IsAlwaysMaximized() ? wxDefaultSize : size; const wxSize sz = IsAlwaysMaximized() ? wxDefaultSize : size;
#ifndef __WXWINCE__
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
exflags |= WS_EX_LAYOUTRTL; exflags |= WS_EX_LAYOUTRTL;
#endif
return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
} }
@@ -565,12 +567,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
// all dialogs are popups // all dialogs are popups
dlgTemplate->style |= WS_POPUP; dlgTemplate->style |= WS_POPUP;
#ifndef __WXWINCE__
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
{ {
dlgTemplate->dwExtendedStyle |= WS_EX_LAYOUTRTL; dlgTemplate->dwExtendedStyle |= WS_EX_LAYOUTRTL;
} }
#ifndef __WXWINCE__
// force 3D-look if necessary, it looks impossibly ugly otherwise // force 3D-look if necessary, it looks impossibly ugly otherwise
if ( style & (wxRESIZE_BORDER | wxCAPTION) ) if ( style & (wxRESIZE_BORDER | wxCAPTION) )
dlgTemplate->style |= DS_MODALFRAME; dlgTemplate->style |= DS_MODALFRAME;

8
src/msw/window.cpp
View File

@@ -1024,6 +1024,9 @@ bool wxWindowMSW::ScrollPages(int pages)
void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir) void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
{ {
#ifdef __WXWINCE__
wxUnusedVar(dir);
#else
const HWND hwnd = GetHwnd(); const HWND hwnd = GetHwnd();
wxCHECK_RET( hwnd, _T("layout direction must be set after window creation") ); 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); ::SetWindowLong(hwnd, GWL_EXSTYLE, styleNew);
} }
#endif
} }
wxLayoutDirection wxWindowMSW::GetLayoutDirection() const wxLayoutDirection wxWindowMSW::GetLayoutDirection() const
{ {
#ifdef __WXWINCE__
return wxLayout_Default;
#else
const HWND hwnd = GetHwnd(); const HWND hwnd = GetHwnd();
wxCHECK_MSG( hwnd, wxLayout_Default, _T("invalid window") ); wxCHECK_MSG( hwnd, wxLayout_Default, _T("invalid window") );
return ::GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL return ::GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL
? wxLayout_RightToLeft ? wxLayout_RightToLeft
: wxLayout_LeftToRight; : wxLayout_LeftToRight;
#endif
} }
wxCoord wxCoord