Updated bundled fltk with latest set of patches for
following fltk str: 2660, 2636, 2599, 2641...
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4675 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/fltk/FL/Fl_Widget.H b/common/fltk/FL/Fl_Widget.H
index 041b2d3..5cc6a79 100644
--- a/common/fltk/FL/Fl_Widget.H
+++ b/common/fltk/FL/Fl_Widget.H
@@ -108,7 +108,6 @@
*/
class FL_EXPORT Fl_Widget {
friend class Fl_Group;
- friend class Fl_X;
Fl_Group* parent_;
Fl_Callback* callback_;
diff --git a/common/fltk/FL/mac.H b/common/fltk/FL/mac.H
index a8f88db..f23dc8e 100644
--- a/common/fltk/FL/mac.H
+++ b/common/fltk/FL/mac.H
@@ -213,6 +213,9 @@
public:
/** Localizable text for the "About xxx" application menu item */
static const char *about;
+ /** Copyright notice for the default about dialog. Will use the information
+ from the bundle if set to an empty string. */
+ static const char *copyright;
/** Localizable text for the "Print Front Window" application menu item.
This menu item won't be displayed if Fl_Mac_App_Menu::print
is set to an empty string.
diff --git a/common/fltk/FL/win32.H b/common/fltk/FL/win32.H
index 2c68266..9297e9f 100644
--- a/common/fltk/FL/win32.H
+++ b/common/fltk/FL/win32.H
@@ -82,6 +82,7 @@
int wait_for_expose;
HDC private_dc; // used for OpenGL
HCURSOR cursor;
+ int custom_cursor;
HDC saved_hdc; // saves the handle of the DC currently loaded
// static variables, static functions and member functions
static Fl_X* first;