From 7dbb3043930c04a2b3eb41abd2b1202e2521beed Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Sat, 3 Oct 2015 11:39:00 -0700 Subject: [PATCH] Removed fltk bug fix that does not apply to newer fltk versions It appears the underlying bug has been fixed. --- Frame.C | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Frame.C b/Frame.C index c3275c8..b698860 100644 --- a/Frame.C +++ b/Frame.C @@ -437,10 +437,12 @@ int Frame::force_y_onscreen(int Y, int H) { // The destructor is called on DestroyNotify, so I don't have to do anything // to the contained window, which is already been destroyed. +#if FL_MAJOR_VERSION < 2 && FL_MINOR_VERSION < 3 // fltk bug: it does not clear these pointers when window is deleted, // causing flwm to crash on window close sometimes: extern Fl_Window *fl_xfocus; extern Fl_Window *fl_xmousewin; +#endif Frame::~Frame() { @@ -452,7 +454,7 @@ Frame::~Frame() { // a legal state value to this location: state_ = UNMAPPED; -#if FL_MAJOR_VERSION < 2 +#if FL_MAJOR_VERSION < 2 && FL_MINOR_VERSION < 3 // fix fltk bug: fl_xfocus = 0; fl_xmousewin = 0;