fixed slider value rounding once again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
350ba193e5
commit
83c22707a4
@ -62,7 +62,7 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
|
||||
else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLL_PAGEDOWN;
|
||||
|
||||
double dvalue = adjust->value;
|
||||
int value = (int)(dvalue >= 0 ? dvalue - 0.5 : dvalue + 0.5);
|
||||
int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
|
||||
|
||||
int orient = wxHORIZONTAL;
|
||||
if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
|
||||
@ -161,7 +161,7 @@ int wxSlider::GetValue() const
|
||||
// we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and
|
||||
// -0.9 is rounded to -1
|
||||
double val = m_adjust->value;
|
||||
return (int)(val >= 0 ? val - 0.5 : val + 0.5);
|
||||
return (int)(val < 0 ? val - 0.5 : val + 0.5);
|
||||
}
|
||||
|
||||
void wxSlider::SetValue( int value )
|
||||
|
@ -62,7 +62,7 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
|
||||
else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLL_PAGEDOWN;
|
||||
|
||||
double dvalue = adjust->value;
|
||||
int value = (int)(dvalue >= 0 ? dvalue - 0.5 : dvalue + 0.5);
|
||||
int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
|
||||
|
||||
int orient = wxHORIZONTAL;
|
||||
if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
|
||||
@ -161,7 +161,7 @@ int wxSlider::GetValue() const
|
||||
// we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and
|
||||
// -0.9 is rounded to -1
|
||||
double val = m_adjust->value;
|
||||
return (int)(val >= 0 ? val - 0.5 : val + 0.5);
|
||||
return (int)(val < 0 ? val - 0.5 : val + 0.5);
|
||||
}
|
||||
|
||||
void wxSlider::SetValue( int value )
|
||||
|
Loading…
Reference in New Issue
Block a user