Damn broken pipes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 996c428eaa95442883557e4b8412fcb97665e419..54600e3d10433dcb52e09598f07844481da6aec6 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -16,10 +16,11 @@
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"

+

 #include <math.h>
 
 #include <math.h>
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -34,6 +35,8 @@ extern bool g_isIdle;
 
 extern bool   g_blockEventsOnDrag;
 
 
 extern bool   g_blockEventsOnDrag;
 

+static const float sensitivity = 0.02;
+

 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------


@@ -46,7 +49,7 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
     if (g_blockEventsOnDrag) return;
 
     float diff = adjust->value - win->m_oldPos;
     if (g_blockEventsOnDrag) return;
 
     float diff = adjust->value - win->m_oldPos;

-    if (fabs(diff) < 0.2) return;
+    if (fabs(diff) < sensitivity) return;

 
     win->m_oldPos = adjust->value;
 
 
     win->m_oldPos = adjust->value;
 


@@ -79,14 +82,6 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 

-wxSlider::wxSlider(void)
-{
-}
-
-wxSlider::~wxSlider(void)
-{
-}
-

 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 996c428eaa95442883557e4b8412fcb97665e419..54600e3d10433dcb52e09598f07844481da6aec6 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -16,10 +16,11 @@
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"

+

 #include <math.h>
 
 #include <math.h>
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -34,6 +35,8 @@ extern bool g_isIdle;
 
 extern bool   g_blockEventsOnDrag;
 
 
 extern bool   g_blockEventsOnDrag;
 

+static const float sensitivity = 0.02;
+

 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------


@@ -46,7 +49,7 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
     if (g_blockEventsOnDrag) return;
 
     float diff = adjust->value - win->m_oldPos;
     if (g_blockEventsOnDrag) return;
 
     float diff = adjust->value - win->m_oldPos;

-    if (fabs(diff) < 0.2) return;
+    if (fabs(diff) < sensitivity) return;

 
     win->m_oldPos = adjust->value;
 
 
     win->m_oldPos = adjust->value;
 


@@ -79,14 +82,6 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 

-wxSlider::wxSlider(void)
-{
-}
-
-wxSlider::~wxSlider(void)
-{
-}
-

 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,