More theme goodies.

[wxWidgets.git] / src / gtk1 / slider.cpp

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 54600e3d10433dcb52e09598f07844481da6aec6..838a5d2549b0ed95c6ceb645bafc25d27f54543f 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/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 );
+    cevent.SetInt( value );
     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") );
-       return FALSE;
+           return FALSE;
     }
 
     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 );
-       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 */
@@ -154,7 +155,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     return TRUE;
 }
 
-int wxSlider::GetValue(void) const
+int wxSlider::GetValue() const
 {
     return (int)(m_adjust->value+0.5);
 }
@@ -183,16 +184,18 @@ void wxSlider::SetRange( int minValue, int maxValue )
 
     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" );
 }
 
-int wxSlider::GetMin(void) const
+int wxSlider::GetMin() const
 {
     return (int)ceil(m_adjust->lower);
 }
 
-int wxSlider::GetMax(void) const
+int wxSlider::GetMax() const
 {
     return (int)ceil(m_adjust->upper);
 }
@@ -208,7 +211,7 @@ void wxSlider::SetPageSize( int pageSize )
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
-int wxSlider::GetPageSize(void) const
+int wxSlider::GetPageSize() const
 {
     return (int)ceil(m_adjust->page_increment);
 }
@@ -224,7 +227,7 @@ void wxSlider::SetThumbLength( int len )
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
-int wxSlider::GetThumbLength(void) const
+int wxSlider::GetThumbLength() const
 {
     return (int)ceil(m_adjust->page_size);
 }
@@ -233,7 +236,7 @@ void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
 }
 
-int wxSlider::GetLineSize(void) const
+int wxSlider::GetLineSize() const
 {
     return 0;
 }
@@ -246,12 +249,12 @@ void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
 {
 }
 
-int wxSlider::GetTickFreq(void) const
+int wxSlider::GetTickFreq() const
 {
     return 0;
 }
 
-void wxSlider::ClearTicks(void)
+void wxSlider::ClearTicks()
 {
 }
 
@@ -259,17 +262,17 @@ void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
 {
 }
 
-int wxSlider::GetSelEnd(void) const
+int wxSlider::GetSelEnd() const
 {
     return 0;
 }
 
-int wxSlider::GetSelStart(void) const
+int wxSlider::GetSelStart() const
 {
     return 0;
 }
 
-void wxSlider::ClearSel(void)
+void wxSlider::ClearSel()
 {
 }