summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2003-06-01 00:31:32 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2003-06-01 00:31:32 +0000
commit936e471e353bdfa8ce308f599ddc075fa93459d1 (patch)
tree424e761f718068e86c6dabe6b073a47d5294a960 /FL
parent9c7ec90412754b36441871b6869ba582b10bb51a (diff)
Add symlink for installs on OSX so that the wrong include file is not
used (OSX compiler bug) Add dummy fl_open_callback() functions on X11 and WIN32. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3021 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/win32.H7
-rw-r--r--FL/x.H7
2 files changed, 10 insertions, 4 deletions
diff --git a/FL/win32.H b/FL/win32.H
index 7eef22ac3..993404c61 100644
--- a/FL/win32.H
+++ b/FL/win32.H
@@ -1,5 +1,5 @@
//
-// "$Id: win32.H,v 1.15.2.3.2.10 2003/01/30 21:40:55 easysw Exp $"
+// "$Id: win32.H,v 1.15.2.3.2.11 2003/06/01 00:31:31 easysw Exp $"
//
// WIN32 header file for the Fast Light Tool Kit (FLTK).
//
@@ -132,8 +132,11 @@ extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm);
+// Dummy function to register a function for opening files via the window manager...
+inline void fl_open_callback(void (*)(const char *)) {}
+
extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
//
-// End of "$Id: win32.H,v 1.15.2.3.2.10 2003/01/30 21:40:55 easysw Exp $".
+// End of "$Id: win32.H,v 1.15.2.3.2.11 2003/06/01 00:31:31 easysw Exp $".
//
diff --git a/FL/x.H b/FL/x.H
index 6673ab782..c71524b28 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -1,5 +1,5 @@
//
-// "$Id: x.H,v 1.10.2.8.2.12 2003/01/30 21:40:58 easysw Exp $"
+// "$Id: x.H,v 1.10.2.8.2.13 2003/06/01 00:31:32 easysw Exp $"
//
// X11 header file for the Fast Light Tool Kit (FLTK).
//
@@ -132,11 +132,14 @@ FL_EXPORT Fl_Window* fl_find(Window xid);
extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
extern FL_EXPORT int fl_background_pixel; // hack into Fl_X::make_xid()
+// Dummy function to register a function for opening files via the window manager...
+inline void fl_open_callback(void (*)(const char *)) {}
+
extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
# endif
#endif
//
-// End of "$Id: x.H,v 1.10.2.8.2.12 2003/01/30 21:40:58 easysw Exp $".
+// End of "$Id: x.H,v 1.10.2.8.2.13 2003/06/01 00:31:32 easysw Exp $".
//