From aed8ac3f8954c07fb2dee3e2ba9ae02fa8890428 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 28 Nov 1999 11:47:36 +0000 Subject: [PATCH] sfs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/region.cpp | 11 ++--------- src/gtk/scrolbar.cpp | 9 ++++++--- src/gtk/settings.cpp | 4 ++-- src/gtk1/region.cpp | 11 ++--------- src/gtk1/scrolbar.cpp | 9 ++++++--- src/gtk1/settings.cpp | 4 ++-- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 3003e15b58..a19730b0d0 100644 --- 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 +#include //----------------------------------------------------------------------------- // wxRegion diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp index c678145ef0..09888e60cd 100644 --- a/src/gtk/scrolbar.cpp +++ b/src/gtk/scrolbar.cpp @@ -17,10 +17,11 @@ #if wxUSE_SCROLLBAR #include "wx/utils.h" + #include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // 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 61810194c3..99894b71a2 100644 --- 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 +#include /* #define wxSYS_COLOUR_SCROLLBAR 0 diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 3003e15b58..a19730b0d0 100644 --- 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 +#include //----------------------------------------------------------------------------- // wxRegion diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp index c678145ef0..09888e60cd 100644 --- a/src/gtk1/scrolbar.cpp +++ b/src/gtk1/scrolbar.cpp @@ -17,10 +17,11 @@ #if wxUSE_SCROLLBAR #include "wx/utils.h" + #include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // 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 61810194c3..99894b71a2 100644 --- 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 +#include /* #define wxSYS_COLOUR_SCROLLBAR 0 -- 2.45.2