Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add symlink for installs on OSX so that the wrong include file is not

Browse Source 
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
This commit is contained in:
Michael R Sweet
2003-06-01 00:31:32 +00:00
parent 9c7ec90412
commit 936e471e35
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/win32.H
+5 -2
View File
@@ -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). // 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 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); 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); 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 $".
// //
FL/x.H
+5 -2
View File
@@ -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). // 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 char fl_override_redirect; // hack into Fl_X::make_xid()
extern FL_EXPORT int fl_background_pixel; // 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); extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
# endif # endif
#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 $".
// //
fltk.list.in
+3 -2
View File
@@ -1,5 +1,5 @@
# #
# "$Id: fltk.list.in,v 1.1.2.10 2003/06/01 00:23:56 easysw Exp $" # "$Id: fltk.list.in,v 1.1.2.11 2003/06/01 00:31:31 easysw Exp $"
# #
# EPM product list file for the Fast Light Tool Kit (FLTK). # EPM product list file for the Fast Light Tool Kit (FLTK).
# #
@@ -53,6 +53,7 @@ $FLUID=@FLUID@
%system darwin %system darwin
f 0444 root sys $includedir/FL/mac.r FL/mac.r f 0444 root sys $includedir/FL/mac.r FL/mac.r
l 0444 root sys /usr/inclue/gcc/darwin/3.1/g++-v3/FL $includedir/FL
d 0555 root sys /Applications/fluid.app - d 0555 root sys /Applications/fluid.app -
d 0555 root sys /Applications/fluid.app/Contents - d 0555 root sys /Applications/fluid.app/Contents -
@@ -261,5 +262,5 @@ f 0444 root sys $datadir/doc/fltk/COPYING COPYING
f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES
# #
# End of "$Id: fltk.list.in,v 1.1.2.10 2003/06/01 00:23:56 easysw Exp $". # End of "$Id: fltk.list.in,v 1.1.2.11 2003/06/01 00:31:31 easysw Exp $".
# #