X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1832043f93af07af3f4891d9a95c4d4e1f70eec5..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/toplevel.cpp diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 15e7729302..272d3c15bf 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -34,24 +34,23 @@ #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 - #include - // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h - #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__) - #include - #endif -#include "wx/msw/wince/missing.h" + #include + #include + // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h + #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__) + #include + #endif #endif -#include "wx/msw/missing.h" #include "wx/msw/winundef.h" +#include "wx/msw/missing.h" #include "wx/display.h" @@ -207,10 +206,19 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const #endif // next translate the individual flags - if ( style & wxMINIMIZE_BOX ) - msflags |= WS_MINIMIZEBOX; - if ( style & wxMAXIMIZE_BOX ) - msflags |= WS_MAXIMIZEBOX; + + // WS_EX_CONTEXTHELP is incompatible with WS_MINIMIZEBOX and WS_MAXIMIZEBOX + // and is ignored if we specify both of them, but chances are that if we + // use wxWS_EX_CONTEXTHELP, we really do want to have the context help + // button while wxMINIMIZE/wxMAXIMIZE are included by default, so the help + // takes precedence + if ( !(GetExtraStyle() & wxWS_EX_CONTEXTHELP) ) + { + if ( style & wxMINIMIZE_BOX ) + msflags |= WS_MINIMIZEBOX; + if ( style & wxMAXIMIZE_BOX ) + msflags |= WS_MAXIMIZEBOX; + } #ifndef __WXWINCE__ if ( style & wxSYSTEM_MENU ) @@ -264,7 +272,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const //else: nothing to do [here] } - if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP ) + if ( GetExtraStyle() & wxWS_EX_CONTEXTHELP ) *exflags |= WS_EX_CONTEXTHELP; #endif // !__WXWINCE__ @@ -471,7 +479,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, if ( !title.empty() ) { - ::SetWindowText(GetHwnd(), title); + ::SetWindowText(GetHwnd(), title.wx_str()); } SubclassWin(m_hWnd); @@ -492,20 +500,14 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title, WXDWORD exflags; WXDWORD flags = MSWGetCreateWindowFlags(&exflags); - wxSize sz; - - if (IsAlwaysMaximized()) - { - sz = wxDefaultSize; - } - else - { - sz = size; - } + const wxSize sz = IsAlwaysMaximized() ? wxDefaultSize : size; - bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); +#ifndef __WXWINCE__ + if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) + exflags |= WS_EX_LAYOUTRTL; +#endif - return result; + return MSWCreate(wxCanvasClassName, title.wx_str(), pos, sz, flags, exflags); } bool wxTopLevelWindowMSW::Create(wxWindow *parent, @@ -565,6 +567,11 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, 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; @@ -686,6 +693,11 @@ bool wxTopLevelWindowMSW::Show(bool show) frame->GetMenuBar()->AddAdornments(GetWindowStyleFlag()); #endif + // we only set pending size if we're maximized before being shown, now that + // we're shown we don't need it any more (it is reset in size event handler + // for child windows but we have to do it ourselves for this parent window) + m_pendingSize = wxDefaultSize; + return true; } @@ -712,9 +724,15 @@ void wxTopLevelWindowMSW::Maximize(bool maximize) // it's shown, so return our size as it will be then in this case if ( maximize ) { - // unfortunately we don't know which display we're on yet so we - // have to use the default one - SetSize(wxGetClientDisplayRect().GetSize()); + // we must only change pending size here, and not call SetSize() + // because otherwise Windows would think that this (full screen) + // size is the natural size for the frame and so would use it when + // the user clicks on "restore" title bar button instead of the + // correct initial frame size + // + // NB: unfortunately we don't know which display we're on yet so we + // have to use the default one + m_pendingSize = wxGetClientDisplayRect().GetSize(); } //else: can't do anything in this case, we don't have the old size } @@ -752,6 +770,88 @@ void wxTopLevelWindowMSW::Restore() DoShowWindow(SW_RESTORE); } +void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir) +{ + if ( dir == wxLayout_Default ) + dir = wxTheApp->GetLayoutDirection(); + + if ( dir != wxLayout_Default ) + wxTopLevelWindowBase::SetLayoutDirection(dir); +} + +// ---------------------------------------------------------------------------- +// wxTopLevelWindowMSW geometry +// ---------------------------------------------------------------------------- + +#ifndef __WXWINCE__ + +void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const +{ + if ( IsIconized() ) + { + WINDOWPLACEMENT wp; + wp.length = sizeof(WINDOWPLACEMENT); + if ( ::GetWindowPlacement(GetHwnd(), &wp) ) + { + RECT& rc = wp.rcNormalPosition; + + // the position returned by GetWindowPlacement() is in workspace + // coordinates except for windows with WS_EX_TOOLWINDOW style + if ( !HasFlag(wxFRAME_TOOL_WINDOW) ) + { + // we must use the correct display for the translation as the + // task bar might be shown on one display but not the other one + int n = wxDisplay::GetFromWindow(this); + wxDisplay dpy(n == wxNOT_FOUND ? 0 : n); + const wxPoint ptOfs = dpy.GetClientArea().GetPosition() - + dpy.GetGeometry().GetPosition(); + + rc.left += ptOfs.x; + rc.top += ptOfs.y; + } + + if ( x ) + *x = rc.left; + if ( y ) + *y = rc.top; + + return; + } + + wxLogLastError(_T("GetWindowPlacement")); + } + //else: normal case + + wxTopLevelWindowBase::DoGetPosition(x, y); +} + +void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const +{ + if ( IsIconized() ) + { + WINDOWPLACEMENT wp; + wp.length = sizeof(WINDOWPLACEMENT); + if ( ::GetWindowPlacement(GetHwnd(), &wp) ) + { + const RECT& rc = wp.rcNormalPosition; + + if ( width ) + *width = rc.right - rc.left; + if ( height ) + *height = rc.bottom - rc.top; + + return; + } + + wxLogLastError(_T("GetWindowPlacement")); + } + //else: normal case + + wxTopLevelWindowBase::DoGetSize(width, height); +} + +#endif // __WXWINCE__ + // ---------------------------------------------------------------------------- // wxTopLevelWindowMSW fullscreen // ---------------------------------------------------------------------------- @@ -877,25 +977,20 @@ wxString wxTopLevelWindowMSW::GetTitle() const return GetLabel(); } -void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon) -{ - SetIcons( wxIconBundle( icon ) ); -} - void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons) { wxTopLevelWindowBase::SetIcons(icons); #if !defined(__WXMICROWIN__) - const wxIcon& sml = icons.GetIcon( wxSize( 16, 16 ) ); - if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 ) + const wxIcon& sml = icons.GetIconOfExactSize(16); + if( sml.Ok() ) { ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL, (LPARAM)GetHiconOf(sml) ); } - const wxIcon& big = icons.GetIcon( wxSize( 32, 32 ) ); - if( big.Ok() && big.GetWidth() == 32 && big.GetHeight() == 32 ) + const wxIcon& big = icons.GetIconOfExactSize(32); + if( big.Ok() ) { ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG, (LPARAM)GetHiconOf(big) ); @@ -1034,6 +1129,52 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags) } } +// --------------------------------------------------------------------------- + +bool wxTopLevelWindowMSW::SetTransparent(wxByte alpha) +{ + typedef DWORD (WINAPI *PSETLAYEREDWINDOWATTR)(HWND, DWORD, BYTE, DWORD); + static PSETLAYEREDWINDOWATTR pSetLayeredWindowAttributes = NULL; + + if ( pSetLayeredWindowAttributes == NULL ) + { + wxDynamicLibrary dllUser32(_T("user32.dll")); + pSetLayeredWindowAttributes = (PSETLAYEREDWINDOWATTR) + dllUser32.GetSymbol(wxT("SetLayeredWindowAttributes")); + } + if ( pSetLayeredWindowAttributes == NULL ) + return false; + + LONG exstyle = GetWindowLong(GetHwnd(), GWL_EXSTYLE); + + // if setting alpha to fully opaque then turn off the layered style + if (alpha == 255) + { + SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle & ~WS_EX_LAYERED); + Refresh(); + return true; + } + + // Otherwise, set the layered style if needed and set the alpha value + if ((exstyle & WS_EX_LAYERED) == 0 ) + SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle | WS_EX_LAYERED); + + 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 == wxOS_WINDOWS_NT && ver_major >= 5); +} + // ---------------------------------------------------------------------------- // wxTopLevelWindow event handling // ----------------------------------------------------------------------------