AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged in fix for GetValue() from the 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-12-14 15:48:30 +00:00
parent beed393c67
commit ef7a25a73e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/slider.cpp
View File

@ -95,7 +95,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
!CreateBase( parent, id, pos, size, style, validator, name )) !CreateBase( parent, id, pos, size, style, validator, name ))
{ {
wxFAIL_MSG( wxT("wxSlider creation failed") ); wxFAIL_MSG( wxT("wxSlider creation failed") );
return FALSE; return FALSE;
} }
m_oldPos = 0.0; m_oldPos = 0.0;
@ -108,7 +108,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
if (style & wxSL_LABELS) if (style & wxSL_LABELS)
{ {
gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE ); gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 ); gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
/* labels need more space and too small window will /* labels need more space and too small window will
cause junk to appear on the dialog */ cause junk to appear on the dialog */
@ -157,7 +157,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
int wxSlider::GetValue() const int wxSlider::GetValue() const
{ {
return (int)(m_adjust->value+0.5); // 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);
} }
void wxSlider::SetValue( int value ) void wxSlider::SetValue( int value )

9
src/gtk1/slider.cpp
View File

@ -95,7 +95,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
!CreateBase( parent, id, pos, size, style, validator, name )) !CreateBase( parent, id, pos, size, style, validator, name ))
{ {
wxFAIL_MSG( wxT("wxSlider creation failed") ); wxFAIL_MSG( wxT("wxSlider creation failed") );
return FALSE; return FALSE;
} }
m_oldPos = 0.0; m_oldPos = 0.0;
@ -108,7 +108,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
if (style & wxSL_LABELS) if (style & wxSL_LABELS)
{ {
gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE ); gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 ); gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
/* labels need more space and too small window will /* labels need more space and too small window will
cause junk to appear on the dialog */ cause junk to appear on the dialog */
@ -157,7 +157,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
int wxSlider::GetValue() const int wxSlider::GetValue() const
{ {
return (int)(m_adjust->value+0.5); // 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);
} }
void wxSlider::SetValue( int value ) void wxSlider::SetValue( int value )