sfs

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

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 3003e15b58be1e1930ace077c1865acc18ad454c..a19730b0d06456fc8ef9b13d5ab2058d7be2b1de 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -13,15 +13,8 @@
 
 #include "wx/region.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-#ifdef __WXDEBUG__
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL ((void*)0L)
-#endif
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxRegion

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index c678145ef07acf0714e40bf1a0f5984ffc88c167..09888e60cd577040e983b46beb6a9589a77f0f84 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -17,10 +17,11 @@
 #if wxUSE_SCROLLBAR
 
 #include "wx/utils.h"
+
 #include <math.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -36,6 +37,8 @@ extern bool g_isIdle;
 extern bool   g_blockEventsOnDrag;
 extern bool   g_blockEventsOnScroll;
 
+static const float sensitivity = 0.02;
+
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
@@ -48,7 +51,7 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
     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;
 

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 61810194c31a4186f63401ae35652b5d0ba2d339..99894b71a27510b7b8b7f9c7106d20fc62f92e63 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -15,8 +15,8 @@
 #include "wx/settings.h"
 #include "wx/debug.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 3003e15b58be1e1930ace077c1865acc18ad454c..a19730b0d06456fc8ef9b13d5ab2058d7be2b1de 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -13,15 +13,8 @@
 
 #include "wx/region.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-#ifdef __WXDEBUG__
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL ((void*)0L)
-#endif
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxRegion

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index c678145ef07acf0714e40bf1a0f5984ffc88c167..09888e60cd577040e983b46beb6a9589a77f0f84 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -17,10 +17,11 @@
 #if wxUSE_SCROLLBAR
 
 #include "wx/utils.h"
+
 #include <math.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -36,6 +37,8 @@ extern bool g_isIdle;
 extern bool   g_blockEventsOnDrag;
 extern bool   g_blockEventsOnScroll;
 
+static const float sensitivity = 0.02;
+
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
@@ -48,7 +51,7 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
     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;
 

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 61810194c31a4186f63401ae35652b5d0ba2d339..99894b71a27510b7b8b7f9c7106d20fc62f92e63 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -15,8 +15,8 @@
 #include "wx/settings.h"
 #include "wx/debug.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0