Call OnParentEnable from wxTextCtrl::Enable

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 54600e3d10433dcb52e09598f07844481da6aec6..6ad996cbfc91828558d9881f03e824d3973f1014 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -61,7 +61,8 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
     else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
     else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLL_PAGEDOWN;
 
     else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
     else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLL_PAGEDOWN;
 

-    int value = (int)ceil(adjust->value);
+    double dvalue = adjust->value;
+    int value = (int)(dvalue >= 0 ? dvalue - 0.5 : dvalue + 0.5);

 
     int orient = wxHORIZONTAL;
     if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
 
     int orient = wxHORIZONTAL;
     if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)


@@ -73,6 +74,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 +96,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 +109,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 */


@@ -154,9 +156,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxSlider::GetValue(void) 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 )


@@ -183,16 +188,18 @@ 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" );
 }
 

-int wxSlider::GetMin(void) const
+int wxSlider::GetMin() const

 {
     return (int)ceil(m_adjust->lower);
 }
 
 {
     return (int)ceil(m_adjust->lower);
 }
 

-int wxSlider::GetMax(void) const
+int wxSlider::GetMax() const

 {
     return (int)ceil(m_adjust->upper);
 }
 {
     return (int)ceil(m_adjust->upper);
 }


@@ -208,7 +215,7 @@ void wxSlider::SetPageSize( int pageSize )
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
     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);
 }
 {
     return (int)ceil(m_adjust->page_increment);
 }


@@ -224,7 +231,7 @@ void wxSlider::SetThumbLength( int len )
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
     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);
 }
 {
     return (int)ceil(m_adjust->page_size);
 }


@@ -233,7 +240,7 @@ void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
 }
 
 {
 }
 

-int wxSlider::GetLineSize(void) const
+int wxSlider::GetLineSize() const

 {
     return 0;
 }
 {
     return 0;
 }


@@ -246,12 +253,12 @@ void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
 {
 }
 
 {
 }
 

-int wxSlider::GetTickFreq(void) const
+int wxSlider::GetTickFreq() const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-void wxSlider::ClearTicks(void)
+void wxSlider::ClearTicks()

 {
 }
 
 {
 }
 


@@ -259,17 +266,17 @@ void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
 {
 }
 
 {
 }
 

-int wxSlider::GetSelEnd(void) const
+int wxSlider::GetSelEnd() const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-int wxSlider::GetSelStart(void) const
+int wxSlider::GetSelStart() const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-void wxSlider::ClearSel(void)
+void wxSlider::ClearSel()

 {
 }
 
 {
 }