X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5bd3c6268277ae8fedddcd6ebafa8ba90f3d551..bf428459fcec8f1916b437ea38c4fc8a0502214a:/src/msw/window.cpp?ds=sidebyside diff --git a/src/msw/window.cpp b/src/msw/window.cpp index ce28f74fa4..e797f3fd61 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -436,10 +436,8 @@ void wxWindowMSW::Init() m_childrenDisabled = NULL; m_frozenness = 0; - // wxWnd - m_hMenu = 0; - m_hWnd = 0; + m_hDWP = 0; m_xThumbSize = 0; m_yThumbSize = 0; @@ -1145,11 +1143,16 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const // wxTopLevelWindow) should remove WS_CHILD in their MSWGetStyle() WXDWORD style = WS_CHILD; - if ( flags & wxCLIP_CHILDREN ) - style |= WS_CLIPCHILDREN; + // using this flag results in very significant reduction in flicker, + // especially with controls inside the static boxes (as the interior of the + // box is not redrawn twice) + style |= WS_CLIPCHILDREN; + + // it doesn't seem useful to use WS_CLIPSIBLINGS here as we officially + // don't support overlapping windows and it only makes sense for them and, + // presumably, gives the system some extra work (to manage more clipping + // regions), so avoid it alltogether - if ( flags & wxCLIP_SIBLINGS ) - style |= WS_CLIPSIBLINGS; if ( flags & wxVSCROLL ) style |= WS_VSCROLL; @@ -1258,11 +1261,13 @@ void wxWindowMSW::OnInternalIdle() state |= MK_SHIFT; if ( wxIsCtrlDown() ) state |= MK_CONTROL; - if ( GetKeyState( VK_LBUTTON ) ) + + // Only the high-order bit should be tested + if ( GetKeyState( VK_LBUTTON ) & (1<<15) ) state |= MK_LBUTTON; - if ( GetKeyState( VK_MBUTTON ) ) + if ( GetKeyState( VK_MBUTTON ) & (1<<15) ) state |= MK_MBUTTON; - if ( GetKeyState( VK_RBUTTON ) ) + if ( GetKeyState( VK_RBUTTON ) & (1<<15) ) state |= MK_RBUTTON; POINT pt; @@ -1526,9 +1531,31 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height) width = 0; if (height < 0) height = 0; - if ( !::MoveWindow(GetHwnd(), x, y, width, height, IsShown() /*Repaint?*/) ) + + // if our parent had prepared a defer window handle for us, use it + wxWindowMSW *parent = GetParent(); + HDWP hdwp = parent ? (HDWP)parent->m_hDWP : NULL; + if ( hdwp ) { - wxLogLastError(wxT("MoveWindow")); + hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL, + x, y, width, height, + SWP_NOZORDER); + if ( !hdwp ) + { + wxLogLastError(_T("DeferWindowPos")); + } + + // hdwp must be updated as it may have been changed + parent->m_hDWP = (WXHANDLE)hdwp; + } + + // otherwise (or if deferring failed) move the window in place immediately + if ( !hdwp ) + { + if ( !::MoveWindow(GetHwnd(), x, y, width, height, TRUE) ) + { + wxLogLastError(wxT("MoveWindow")); + } } } @@ -1871,8 +1898,21 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg) case VK_ESCAPE: { #if wxUSE_BUTTON - wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL), - wxButton); + wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL),wxButton); + + // our own wxLogDialog should react to Esc + // without Cancel button but this is a private class + // so let's try recognize it by content + #if wxUSE_LOG_DIALOG + if ( !btn && + wxDynamicCast(this,wxDialog) && + FindWindow(wxID_MORE) && + FindWindow(wxID_OK) && + !FindWindow(wxID_CANCEL) && + GetTitle().MakeLower().StartsWith(wxTheApp->GetAppName().c_str()) + ) + btn = wxDynamicCast(FindWindow(wxID_OK),wxButton); + #endif // wxUSE_LOG_DIALOG if ( btn && btn->IsEnabled() ) { // if we do have a cancel button, do press it @@ -1913,7 +1953,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg) bProcess = false; } // FIXME: this should be handled by - // wxNavigationKeyEvent handler and not here!! + // wxNavigationKeyEvent handler and not here! else { #if wxUSE_BUTTON @@ -2222,11 +2262,56 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l (void)HandleDestroy(); break; +#ifndef __SMARTPHONE__ // or wxWinCE in general ? + case WM_WINDOWPOSCHANGING: + { + WINDOWPOS *wp = wx_reinterpret_cast(WINDOWPOS *, lParam); + + if ( wp->flags & SWP_NOSIZE ) + break; + + // when we resize this window, its children are probably going + // to be repositioned as well, prepare to use DeferWindowPos() + // for them + const int numChildren = GetChildren().GetCount(); + if ( numChildren > 1 ) + { + m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren); + if ( !m_hDWP ) + { + wxLogLastError(_T("BeginDeferWindowPos")); + } + } + } + break; + + case WM_WINDOWPOSCHANGED: + // first let DefWindowProc() handle the message: it will generate + // WM_MOVE and WM_SIZE as needed + processed = MSWDefWindowProc(message, wParam, lParam) == 0; + + // then change the positions of all child windows at once + if ( m_hDWP ) + { + // put all child controls in place at once now + if ( !::EndDeferWindowPos((HDWP)m_hDWP) ) + { + wxLogLastError(_T("EndDeferWindowPos")); + } + } + break; +#endif // __SMARTPHONE__ + + case WM_SIZE: + processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); + break; + case WM_MOVE: processed = HandleMove(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); break; #if !defined(__WXWINCE__) + // TODO: move those in WM_WINDOWPOSCHANGING case above case WM_MOVING: { LPRECT pRect = (LPRECT)lParam; @@ -2244,13 +2329,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l } } break; -#endif - - case WM_SIZE: - processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); - break; -#if !defined(__WXWINCE__) case WM_SIZING: { LPRECT pRect = (LPRECT)lParam; @@ -2268,7 +2347,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l } } break; -#endif +#endif // !__WXWINCE__ #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) case WM_ACTIVATEAPP: @@ -3997,9 +4076,10 @@ bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc) void wxWindowMSW::OnEraseBackground(wxEraseEvent& event) { - // standard controls always erase their background themselves (although the - // user may try to override it in a derived class) - if ( IsOfStandardClass() ) + // standard non top level controls (i.e. except the dialogs) always erase + // their background themselves in HandleCtlColor() or have some control- + // specific ways to set the colours (common controls) + if ( IsOfStandardClass() && !IsTopLevel() ) { event.Skip(); return; @@ -4015,21 +4095,26 @@ void wxWindowMSW::OnEraseBackground(wxEraseEvent& event) // do default background painting - wxDC& dc = *event.GetDC(); - HBRUSH hBrush = (HBRUSH)MSWGetBgBrush(dc.GetHDC()); - if ( hBrush ) - { - RECT rc; - ::GetClientRect(GetHwnd(), &rc); - ::FillRect(GetHdcOf(dc), &rc, hBrush); - } - else + if ( !DoEraseBackground(*event.GetDC()) ) { // let the system paint the background event.Skip(); } } +bool wxWindowMSW::DoEraseBackground(wxDC& dc) +{ + HBRUSH hBrush = (HBRUSH)MSWGetBgBrush(dc.GetHDC()); + if ( !hBrush ) + return false; + + RECT rc; + ::GetClientRect(GetHwnd(), &rc); + ::FillRect(GetHdcOf(dc), &rc, hBrush); + + return true; +} + WXHBRUSH wxWindowMSW::MSWGetSolidBgBrushForChild(wxWindow *child) { wxColour col = MSWGetBgColourForChild(child); @@ -4044,22 +4129,48 @@ WXHBRUSH wxWindowMSW::MSWGetSolidBgBrushForChild(wxWindow *child) return 0; } -wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow * WXUNUSED(child)) +wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow *child) { - return m_hasBgCol ? GetBackgroundColour() : wxNullColour; + if ( m_hasBgCol ) + { + // our background colour applies to: + // 1. this window itself, always + // 2. all children unless the colour is "not inheritable" + // 3. immediate transparent children which should show the same + // background as we do, but not for transparent grandchildren + // which use the background of their immediate parent instead + if ( m_inheritBgCol || + child == this || + (child->HasTransparentBackground() && + child->GetParent() == this) ) + { + return GetBackgroundColour(); + } + } + + return wxNullColour; } -WXHBRUSH wxWindow::MSWGetBgBrush(WXHDC hDC) +WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC) { - for ( wxWindow *win = this; win; win = win->GetParent() ) - { - // background is not inherited beyond the containing TLW - if ( win->IsTopLevel() ) - break; + return parent->MSWGetBgBrushForChild(hDC, (wxWindow *)this); +} +WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC) +{ + for ( wxWindow *win = (wxWindow *)this; win; win = win->GetParent() ) + { WXHBRUSH hBrush = MSWGetBgBrushForSelf(win, hDC); if ( hBrush ) return hBrush; + + // background is not inherited beyond the windows which have their own + // fixed background such as top level windows and notebooks and for + // windows for which a custom colour had been explicitly set with + // SetOwnBackgroundColour() and so shouldn't affect its children + if ( win->ProvidesBackground() || + (win->m_hasBgCol && !win->m_inheritBgCol) ) + break; } return 0; @@ -4966,8 +5077,10 @@ int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam) case VK_NUMLOCK: id = WXK_NUMLOCK; break; case VK_SCROLL: id = WXK_SCROLL; break; + // the mapping for these keys may be incorrect on non-US keyboards so + // maybe we shouldn't map them to ASCII values at all case VK_OEM_1: id = ';'; break; - case VK_OEM_PLUS: id = '='; break; + case VK_OEM_PLUS: id = '+'; break; case VK_OEM_COMMA: id = ','; break; case VK_OEM_MINUS: id = '-'; break; case VK_OEM_PERIOD: id = '.'; break; @@ -5082,7 +5195,7 @@ bool wxGetKeyState(wxKeyCode key) bool bVirtual; //High order with GetAsyncKeyState only available on WIN32 -#ifdef __WIN32__ +#ifdef __WIN32__ //If the requested key is a LED key, return //true if the led is pressed if (key == WXK_NUMLOCK || @@ -5090,12 +5203,12 @@ bool wxGetKeyState(wxKeyCode key) key == WXK_SCROLL) { #endif - //low order bit means LED is highlighted, + //low order bit means LED is highlighted, //high order means key is down //Here, for compat with other ports we want both return GetKeyState( wxCharCodeWXToMSW(key, &bVirtual) ) != 0; -#ifdef __WIN32__ +#ifdef __WIN32__ } else {