removed read() declaration which resulted in a warning

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index a235fa0e73ca8ee960dc4d0858a761ccb2b3c7da..df1cba34af5e367a15cfcc0e25fe187dc8683dfa 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        scrolbar.cpp
+// Name:        src/gtk/scrolbar.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -12,10 +12,12 @@
 #pragma implementation "scrolbar.h"
 #endif
 
-#include "wx/scrolbar.h"
+#include "wx/defs.h"
 
 #if wxUSE_SCROLLBAR
 
+#include "wx/scrolbar.h"
+
 #include "wx/utils.h"
 
 #include <math.h>
@@ -64,7 +66,7 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *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 = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
   
@@ -186,7 +188,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 int wxScrollBar::GetThumbPosition() const
 {
     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);
 }
 
 int wxScrollBar::GetThumbSize() const