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

Don't log errors from GetScrollInfo since it is possible that there

Browse Source 
will be an error return when there isn't actually an error (ie. when
the window doesn't have scrollbars yet.)  Left the if... statements in
place in case we want to add an assert there later.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2003-07-29 18:53:35 +00:00
parent a565c7645e
commit f676b38715
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/msw/window.cpp
View File

@ -765,14 +765,15 @@ inline int GetScrollPosition(HWND hWnd, int wOrient)
#ifdef __WXMICROWIN__
return ::GetScrollPosWX(hWnd, wOrient);
#else
SCROLLINFO scrollInfo;
WinStruct<SCROLLINFO> scrollInfo;
scrollInfo.cbSize = sizeof(SCROLLINFO);
scrollInfo.fMask = SIF_POS;
if ( !::GetScrollInfo(hWnd,
wOrient,
&scrollInfo) )
wOrient,
&scrollInfo) )
{
wxLogLastError(_T("GetScrollInfo"));
// Not neccessarily an error, if there are no scrollbars yet.
// wxLogLastError(_T("GetScrollInfo"));
}
return scrollInfo.nPos;
// return ::GetScrollPos(hWnd, wOrient);
@ -799,13 +800,15 @@ int wxWindowMSW::GetScrollRange(int orient) const
::GetScrollRange(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
&minPos, &maxPos);
#endif
SCROLLINFO scrollInfo;
WinStruct<SCROLLINFO> scrollInfo;
scrollInfo.fMask = SIF_RANGE;
if ( !::GetScrollInfo(hWnd,
orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
&scrollInfo) )
orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
&scrollInfo) )
{
wxLogLastError(_T("GetScrollInfo"));
// Most of the time this is not really an error, since the return
// value can also be zero when there is no scrollbar yet.
// wxLogLastError(_T("GetScrollInfo"));
}
maxPos = scrollInfo.nMax;
@ -1008,10 +1011,10 @@ bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc)
wxString str(wxGetWindowClass(hWnd));
if (str == wxCanvasClassName ||
str == wxCanvasClassNameNR ||
str == wxMDIFrameClassName ||
str == wxMDIFrameClassNameNoRedraw ||
str == wxMDIChildFrameClassName ||
str == wxMDIChildFrameClassNameNoRedraw ||
str == wxMDIFrameClassName ||
str == wxMDIFrameClassNameNoRedraw ||
str == wxMDIChildFrameClassName ||
str == wxMDIChildFrameClassNameNoRedraw ||
str == _T("wxTLWHiddenParent"))
return TRUE; // Effectively means don't subclass
else
@ -4715,7 +4718,8 @@ bool wxWindowMSW::MSWOnScroll(int orientation, WXWORD wParam,
: SB_VERT,
&scrollInfo) )
{
wxLogLastError(_T("GetScrollInfo"));
// Not neccessarily an error, if there are no scrollbars yet.
// wxLogLastError(_T("GetScrollInfo"));
}
event.SetPosition(scrollInfo.nTrackPos);