X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5dbcb50a4fc20fa472be523d8c5606587a1ae5e..4c5da5e42d54e0d660a04f4160c60b27090656c8:/src/msw/window.cpp diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 031585be7c..3c94a80359 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -820,7 +820,7 @@ inline int GetScrollPosition(HWND hWnd, int wOrient) wOrient, &scrollInfo) ) { - // Not neccessarily an error, if there are no scrollbars yet. + // Not necessarily an error, if there are no scrollbars yet. // wxLogLastError(_T("GetScrollInfo")); } return scrollInfo.nPos; @@ -1370,7 +1370,7 @@ void wxWindowMSW::Refresh(bool eraseBack, const wxRect *rect) pRect = NULL; } - // RedrawWindow not available on SmartPhone or eVC++ 3 + // RedrawWindow not available on SmartPhone or eVC++ 3 #if !defined(__SMARTPHONE__) && !(defined(_WIN32_WCE) && _WIN32_WCE < 400) UINT flags = RDW_INVALIDATE | RDW_ALLCHILDREN; if ( eraseBack ) @@ -1659,7 +1659,8 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags) // save the pending dimensions or not. This isn't done in DoMoveWindow // (where the hdwp is used) because some controls have thier own // DoMoveWindow so it is easier to catch it here. - HDWP hdwp = GetParent() && !IsTopLevel() ? (HDWP)GetParent()->m_hDWP : NULL; + wxWindowMSW *parent = GetParent(); + HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL; if (hdwp) { m_pendingPosition = wxPoint(x, y); @@ -4286,7 +4287,7 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam) node; node = node->GetNext() ) { - wxWindow *child = node->GetData(); + wxWindowMSW *child = node->GetData(); child->m_pendingPosition = wxDefaultPosition; child->m_pendingSize = wxDefaultSize; } @@ -5046,7 +5047,7 @@ bool wxWindowMSW::MSWOnScroll(int orientation, WXWORD wParam, : SB_VERT, &scrollInfo) ) { - // Not neccessarily an error, if there are no scrollbars yet. + // Not necessarily an error, if there are no scrollbars yet. // wxLogLastError(_T("GetScrollInfo")); }