aboutsummaryrefslogtreecommitdiffstats
path: root/testing/dillo/fl_oldfocus.patch
diff options
context:
space:
mode:
authorIsaac Dunham <ibid.ag@gmail.com>2014-11-18 21:41:37 -0800
committerNatanael Copa <ncopa@alpinelinux.org>2014-11-19 08:20:32 +0000
commita5d57af5d06c32d6b8eee3cbea1a758e052df2b8 (patch)
tree1b598ebd9e199eec8525ffe9e62b4ea5bc147647 /testing/dillo/fl_oldfocus.patch
parent6a7ca203ef1b561069e17a3463e085d1eb7c8837 (diff)
downloadaports-a5d57af5d06c32d6b8eee3cbea1a758e052df2b8.tar.bz2
aports-a5d57af5d06c32d6b8eee3cbea1a758e052df2b8.tar.xz
testing/dillo: avoid fl_oldfocus
It's not supposed to be public, and isn't visible in FLTK 1.3.3.
Diffstat (limited to 'testing/dillo/fl_oldfocus.patch')
-rw-r--r--testing/dillo/fl_oldfocus.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/testing/dillo/fl_oldfocus.patch b/testing/dillo/fl_oldfocus.patch
new file mode 100644
index 0000000000..58859cb535
--- /dev/null
+++ b/testing/dillo/fl_oldfocus.patch
@@ -0,0 +1,32 @@
+commit 6cace8b8ecedd11a54b02e1dd08f9a2880bdb1b1
+Author: Isaac Dunham <ibid.ag@gmail.com>
+Date: Tue Nov 18 21:06:54 2014 -0800
+
+ Don't use FLTK internal symbols; fix build with FLTK 1.3.3
+ Patch based on http://hg.dillo.org/dillo/raw-rev/eb902ac9fc66
+
+diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc
+index 30a19d5..9ec5a71 100644
+--- a/dw/fltkviewbase.cc
++++ b/dw/fltkviewbase.cc
+@@ -27,8 +27,6 @@
+ #include <stdio.h>
+ #include "../lout/msg.h"
+
+-extern Fl_Widget* fl_oldfocus;
+-
+ using namespace lout::object;
+ using namespace lout::container::typed;
+
+@@ -364,7 +362,10 @@ int FltkViewBase::handle (int event)
+ }
+ return 1;
+ case FL_UNFOCUS:
+- focused_child = fl_oldfocus;
++ // was: focused_child = fl_oldfocus;
++ for (Fl_Widget *p = this; p; p = p->parent())
++ focused_child = p;
++
+ return 0;
+ case FL_KEYBOARD:
+ if (Fl::event_key() == FL_Tab)