summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-02-25 13:00:53 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-02-25 13:00:53 +0000
commitfc60a90a6716994362b2e5548bb9be393feec2a1 (patch)
tree7727033be70b1fa5c6956a3db3f1e2d991466eff
parentc7d5670c3aa1e9f59b7bd80d5f559f35cff84fba (diff)
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
-rw-r--r--CHANGES1
-rw-r--r--FL/Fl_Scrollbar.H1
-rw-r--r--src/Fl_Scrollbar.cxx7
3 files changed, 9 insertions, 0 deletions
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$".
//