projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed incorrect param from docs
[wxWidgets.git]
/
src
/
gtk
/
slider.cpp
diff --git
a/src/gtk/slider.cpp
b/src/gtk/slider.cpp
index bd6f84a6c4c32dd19db5c22e63fdeb667184f991..838a5d2549b0ed95c6ceb645bafc25d27f54543f 100644
(file)
--- a/
src/gtk/slider.cpp
+++ b/
src/gtk/slider.cpp
@@
-73,6
+73,7
@@
static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
cevent.SetEventObject( win );
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
cevent.SetEventObject( win );
+ cevent.SetInt( value );
win->GetEventHandler()->ProcessEvent( cevent );
}
win->GetEventHandler()->ProcessEvent( cevent );
}
@@
-94,7
+95,7
@@
bool wxSlider::Create(wxWindow *parent, wxWindowID id,
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxSlider creation failed") );
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxSlider creation failed") );
- return FALSE;
+
return FALSE;
}
m_oldPos = 0.0;
}
m_oldPos = 0.0;
@@
-107,7
+108,7
@@
bool wxSlider::Create(wxWindow *parent, wxWindowID id,
if (style & wxSL_LABELS)
{
gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
if (style & wxSL_LABELS)
{
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
cause junk to appear on the dialog */
/* labels need more space and too small window will
cause junk to appear on the dialog */
@@
-183,6
+184,8
@@
void wxSlider::SetRange( int minValue, int maxValue )
m_adjust->lower = fmin;
m_adjust->upper = fmax;
m_adjust->lower = fmin;
m_adjust->upper = fmax;
+ m_adjust->step_increment = 1.0;
+ m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
}
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
}