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

check that we do have scrollbars before using them to avoid crashes when SetScrollXXX() methods are called for windows which are not scrollable [backport from HEAD]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-21 11:46:56 +00:00
parent 24d135e59d
commit d5cc95bff0
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gtk/window.cpp
View File

@@ -4116,8 +4116,8 @@ void wxWindowGTK::SetScrollbar(int orient,
int range,
bool WXUNUSED(update))
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_RET( sb, _T("this window is not scrollable") );
if (range > 0)
{
@@ -4134,7 +4134,7 @@ void wxWindowGTK::SetScrollbar(int orient,
pos = range - thumbVisible;
if (pos < 0)
pos = 0;
GtkAdjustment* adj = m_scrollBar[ScrollDirFromOrient(orient)]->adjustment;
GtkAdjustment * const adj = sb->adjustment;
adj->step_increment = 1;
adj->page_increment =
adj->page_size = thumbVisible;
@@ -4145,15 +4145,15 @@ void wxWindowGTK::SetScrollbar(int orient,
void wxWindowGTK::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
const int dir = ScrollDirFromOrient(orient);
GtkRange * const sb = m_scrollBar[dir];
wxCHECK_RET( sb, _T("this window is not scrollable") );
// This check is more than an optimization. Without it, the slider
// will not move smoothly while tracking when using wxScrollHelper.
if (GetScrollPos(orient) != pos)
{
const int dir = ScrollDirFromOrient(orient);
GtkAdjustment* adj = m_scrollBar[dir]->adjustment;
GtkAdjustment* adj = sb->adjustment;
const int max = int(adj->upper - adj->page_size);
if (pos > max)
pos = max;
@@ -4171,26 +4171,26 @@ void wxWindowGTK::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
int wxWindowGTK::GetScrollThumb(int orient) const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
return int(m_scrollBar[ScrollDirFromOrient(orient)]->adjustment->page_size);
return int(sb->adjustment->page_size);
}
int wxWindowGTK::GetScrollPos( int orient ) const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
return int(m_scrollBar[ScrollDirFromOrient(orient)]->adjustment->value + 0.5);
return int(sb->adjustment->value + 0.5);
}
int wxWindowGTK::GetScrollRange( int orient ) const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
return int(m_scrollBar[ScrollDirFromOrient(orient)]->adjustment->upper);
return int(sb->adjustment->upper);
}
// Determine if increment is the same as +/-x, allowing for some small