#include "wx/toplevel.h"
#ifndef WX_PRECOMP
+ #include "wx/msw/missing.h"
#include "wx/app.h"
#include "wx/dialog.h"
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/frame.h"
#include "wx/containr.h" // wxSetFocusToChild()
+ #include "wx/module.h"
#endif //WX_PRECOMP
-#include "wx/module.h"
#include "wx/dynlib.h"
#include "wx/msw/private.h"
#if defined(__WXWINCE__) && !defined(__HANDHELDPC__)
- #include <ole2.h>
- #include <shellapi.h>
- // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
- #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
- #include <aygshell.h>
- #endif
-#include "wx/msw/wince/missing.h"
+ #include <ole2.h>
+ #include <shellapi.h>
+ // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
+ #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
+ #include <aygshell.h>
+ #endif
+ #include "wx/msw/wince/missing.h"
#endif
-#include "wx/msw/missing.h"
#include "wx/msw/winundef.h"
#include "wx/display.h"
}
#endif
-bool wxTopLevelWindowMSW::MSWProcessMessage(WXMSG* pMsg)
-{
- // MSW specific feature: if the dialog has only one notebook-like child
- // window (actually it could be any window that returns true from its
- // HasMultiplePages()), then [Shift-]Ctrl-Tab and Ctrl-PageUp/Down keys
- // should iterate over its pages even if the focus is outside of the
- // control because this is how the standard MSW properties dialogs behave
- if ( pMsg->message == WM_KEYDOWN && wxIsCtrlDown() &&
- (pMsg->wParam == VK_TAB ||
- pMsg->wParam == VK_PRIOR ||
- pMsg->wParam == VK_NEXT) )
- {
- // check if we have a unique notebook-like child
- wxWindow *bookctrl = NULL;
- for ( wxWindowList::const_iterator i = GetChildren().begin(),
- end = GetChildren().end();
- i != end;
- ++i )
- {
- wxWindow * const window = *i;
- if ( window->HasMultiplePages() )
- {
- if ( bookctrl )
- {
- // this is the second book-like control already so don't do
- // anything as we don't know which one should have its page
- // changed
- bookctrl = NULL;
- break;
- }
-
- bookctrl = window;
- }
- }
-
- if ( bookctrl && bookctrl->wxWindowMSW::MSWProcessMessage(pMsg) )
- return true;
- }
-
- return wxTopLevelWindowBase::MSWProcessMessage(pMsg);
-}
-
WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
WXLRESULT rc = 0;
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);
}
dlgTemplate->style |= WS_POPUP;
#ifndef __WXWINCE__
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ dlgTemplate->dwExtendedStyle |= WS_EX_LAYOUTRTL;
+ }
+
// force 3D-look if necessary, it looks impossibly ugly otherwise
if ( style & (wxRESIZE_BORDER | wxCAPTION) )
dlgTemplate->style |= DS_MODALFRAME;
DoShowWindow(SW_RESTORE);
}
+void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
+{
+ if ( dir == wxLayout_Default )
+ dir = wxTheApp->GetLayoutDirection();
+
+ if ( dir != wxLayout_Default )
+ wxTopLevelWindowBase::SetLayoutDirection(dir);
+}
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowMSW fullscreen
// ----------------------------------------------------------------------------
if ((exstyle & WS_EX_LAYERED) == 0 )
SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle | WS_EX_LAYERED);
- return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
+ return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
}
bool wxTopLevelWindowMSW::CanSetTransparent()
{
// The API is available on win2k and above
-
+
static int os_type = -1;
static int ver_major = -1;
if (os_type == -1)
os_type = ::wxGetOsVersion(&ver_major);
- return (os_type == wxWINDOWS_NT && ver_major >= 5);
+ return (os_type == wxOS_WINDOWS_NT && ver_major >= 5);
}
// ----------------------------------------------------------------------------