From fc60a90a6716994362b2e5548bb9be393feec2a1 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Mon, 25 Feb 2008 13:00:53 +0000
Subject: STR 1880: Fixed timer leak in Fl_Scrollbar

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6042 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CHANGES              | 1 +
 FL/Fl_Scrollbar.H    | 1 +
 src/Fl_Scrollbar.cxx | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/CHANGES b/CHANGES
index 7698278aa..e849998fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ CHANGES IN FLTK 1.1.8
 	  STR #1742, STR #1777, STR #1794, STR #1827, STR #1843,
 	  STR #1796, STR #1815, STR #1726, STR #1753, STR #1855,
 	  STR #1862, STR #1867, STR #1874)
+	- Fixed possible timer leak in Scrollbar (STR #1880)
 	- Added documentation about the potential limitations
 	  of Fl::grab on newer operating systems (STR #1747)
 	- Fixed lockout when mixing popups and alerts
diff --git a/FL/Fl_Scrollbar.H b/FL/Fl_Scrollbar.H
index 08245477d..0d474ea0b 100644
--- a/FL/Fl_Scrollbar.H
+++ b/FL/Fl_Scrollbar.H
@@ -42,6 +42,7 @@ protected:
 public:
 
   Fl_Scrollbar(int x,int y,int w,int h, const char *l = 0);
+  ~Fl_Scrollbar();
   int handle(int);
 
   int value() {return int(Fl_Slider::value());}
diff --git a/src/Fl_Scrollbar.cxx b/src/Fl_Scrollbar.cxx
index 22a05c84b..b2c50905f 100644
--- a/src/Fl_Scrollbar.cxx
+++ b/src/Fl_Scrollbar.cxx
@@ -265,6 +265,13 @@ Fl_Scrollbar::Fl_Scrollbar(int X, int Y, int W, int H, const char* L)
   step(1);
 }
 
+Fl_Scrollbar::~Fl_Scrollbar()
+{
+  if (pushed_)
+    Fl::remove_timeout(timeout_cb, this);
+}
+
+
 //
 // End of "$Id$".
 //
-- 
cgit v1.2.3