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

Use wxRound() instead of (int)(my_double + 0.5);

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-02-04 21:12:16 +00:00
parent 365b9f162a
commit 40b849aafe
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/window.cpp
View File

@@ -4195,7 +4195,7 @@ int wxWindowGTK::GetScrollThumb(int orient) const
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
return int(sb->adjustment->page_size); return wxRound(sb->adjustment->page_size);
} }
int wxWindowGTK::GetScrollPos( int orient ) const int wxWindowGTK::GetScrollPos( int orient ) const
@@ -4203,7 +4203,7 @@ int wxWindowGTK::GetScrollPos( int orient ) const
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
return int(sb->adjustment->value + 0.5); return wxRound(sb->adjustment->value);
} }
int wxWindowGTK::GetScrollRange( int orient ) const int wxWindowGTK::GetScrollRange( int orient ) const
@@ -4211,7 +4211,7 @@ int wxWindowGTK::GetScrollRange( int orient ) const
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
return int(sb->adjustment->upper); return wxRound(sb->adjustment->upper);
} }
// Determine if increment is the same as +/-x, allowing for some small // Determine if increment is the same as +/-x, allowing for some small
@@ -4230,14 +4230,14 @@ wxEventType wxWindowGTK::GetScrollEventType(GtkRange* range)
const int barIndex = range == m_scrollBar[1]; const int barIndex = range == m_scrollBar[1];
GtkAdjustment* adj = range->adjustment; GtkAdjustment* adj = range->adjustment;
const int value = int(adj->value + 0.5); const int value = wxRound(adj->value);
// save previous position // save previous position
const double oldPos = m_scrollPos[barIndex]; const double oldPos = m_scrollPos[barIndex];
// update current position // update current position
m_scrollPos[barIndex] = adj->value; m_scrollPos[barIndex] = adj->value;
// If event should be ignored, or integral position has not changed // If event should be ignored, or integral position has not changed
if (!m_hasVMT || g_blockEventsOnDrag || value == int(oldPos + 0.5)) if (!m_hasVMT || g_blockEventsOnDrag || value == wxRound(oldPos))
{ {
return wxEVT_NULL; return wxEVT_NULL;
} }