X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a07a7d8528987ea635dbf111cf08f58c6d16090..4f55a07f9f4c6ba6905aaa8e584e6fb14771d278:/src/gtk/slider.cpp?ds=sidebyside

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 6ad996cbfc..eeb55ab4f5 100644
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        gtk/slider.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -33,7 +33,7 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
 
 static const float sensitivity = 0.02;
 
@@ -62,11 +62,10 @@ 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)
-        orient = wxVERTICAL;
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;
 
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
@@ -161,7 +160,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 )
@@ -245,41 +244,6 @@ int wxSlider::GetLineSize() const
     return 0;
 }
 
-void wxSlider::SetTick( int WXUNUSED(tickPos) )
-{
-}
-
-void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
-{
-}
-
-int wxSlider::GetTickFreq() const
-{
-    return 0;
-}
-
-void wxSlider::ClearTicks()
-{
-}
-
-void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
-{
-}
-
-int wxSlider::GetSelEnd() const
-{
-    return 0;
-}
-
-int wxSlider::GetSelStart() const
-{
-    return 0;
-}
-
-void wxSlider::ClearSel()
-{
-}
-
 bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);