diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_File_Browser.cxx | 9 | ||||
| -rw-r--r-- | src/Fl_get_system_colors.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_mac.cxx | 10 | ||||
| -rw-r--r-- | src/flstring.h | 14 |
4 files changed, 28 insertions, 13 deletions
diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index fb11989bb..711ac5b14 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Browser.cxx,v 1.1.2.18 2002/07/01 21:14:20 easysw Exp $" +// "$Id: Fl_File_Browser.cxx,v 1.1.2.19 2002/07/17 06:09:25 matthiaswm Exp $" // // Fl_File_Browser routines. // @@ -62,7 +62,8 @@ # include <os2.h> #endif // __EMX__ -#ifdef __APPLE__ +// CodeWarrior (__MWERKS__) gets its include paths confused, so we temporarily disable this +#if defined(__APPLE__) && !defined(__MWERKS__) # include <sys/param.h> # include <sys/ucred.h> # include <sys/mount.h> @@ -488,7 +489,7 @@ Fl_File_Browser::load(const char *directory,// I - Directory to load num_files ++; } -#elif defined(__APPLE__) +#elif defined(__APPLE__) && !defined(__MWERKS__) // MacOS X and Darwin use getfsstat() system call... int numfs; // Number of file systems struct statfs *fs; // Buffer for file system info @@ -643,5 +644,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string // -// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.18 2002/07/01 21:14:20 easysw Exp $". +// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.19 2002/07/17 06:09:25 matthiaswm Exp $". // diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index eb1a6e170..bdb28b963 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.10 2002/05/16 12:47:43 easysw Exp $" +// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.11 2002/07/17 06:09:26 matthiaswm Exp $" // // System color support for the Fast Light Tool Kit (FLTK). // @@ -34,6 +34,10 @@ #include <FL/Fl_Tiled_Image.H> #include "tile.xpm" +#if defined __APPLE__ && defined __MWERKS__ + extern "C" int putenv(const char*); +#endif + void Fl::background(uchar r, uchar g, uchar b) { // replace the gray ramp so that FL_GRAY is this color @@ -313,5 +317,5 @@ int Fl::reload_scheme() { // -// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.10 2002/05/16 12:47:43 easysw Exp $". +// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.11 2002/07/17 06:09:26 matthiaswm Exp $". // diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index fc8983c8d..fa1a31b50 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.31 2002/07/11 04:11:41 matthiaswm Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.32 2002/07/17 06:09:26 matthiaswm Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -432,7 +432,7 @@ static pascal OSStatus carbonDispatchHandler( EventHandlerCallRef nextHandler, E /** * this callback simply quits the main event loop handler, so FLTK can do its magic */ -static void timerProcCB( EventLoopTimerRef, void* ) +static pascal void timerProcCB( EventLoopTimerRef, void* ) { fl_lock_function(); @@ -1214,7 +1214,7 @@ Fl_Window *fl_dnd_target_window = 0; /** * Drag'n'drop tracking handler */ -OSErr dndTrackingHandler( DragTrackingMessage msg, WindowPtr w, void *userData, DragReference dragRef ) +static pascal OSErr dndTrackingHandler( DragTrackingMessage msg, WindowPtr w, void *userData, DragReference dragRef ) { Fl_Window *target = (Fl_Window*)userData; Point mp; @@ -1270,7 +1270,7 @@ OSErr dndTrackingHandler( DragTrackingMessage msg, WindowPtr w, void *userData, /** * Drag'n'drop receive handler */ -OSErr dndReceiveHandler( WindowPtr w, void *userData, DragReference dragRef ) +static pascal OSErr dndReceiveHandler( WindowPtr w, void *userData, DragReference dragRef ) { Point mp; OSErr ret; @@ -1744,6 +1744,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.31 2002/07/11 04:11:41 matthiaswm Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.32 2002/07/17 06:09:26 matthiaswm Exp $". // diff --git a/src/flstring.h b/src/flstring.h index df1615c3d..a3c454f44 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -1,5 +1,5 @@ /* - * "$Id: flstring.h,v 1.1.2.8 2002/07/14 19:08:25 easysw Exp $" + * "$Id: flstring.h,v 1.1.2.9 2002/07/17 06:09:26 matthiaswm Exp $" * * Common string header file for the Fast Light Tool Kit (FLTK). * @@ -53,6 +53,16 @@ # define strncasecmp(s,t,n) strnicmp((s), (t), (n)) # endif /* WIN32 */ +// MetroWerks' CodeWarrior put thes "non-standard" functions int <extras.h> +// which unfortunatly does not play well otherwise when included - to be resolved +# if defined __APPLE__ && defined __MWERKS__ + extern "C" { + int strcasecmp(const char*,const char*); + int strncasecmp(const char*,const char*,int); + char *strdup(const char*); + } +# endif + # ifdef __cplusplus extern "C" { # endif /* __cplusplus */ @@ -88,5 +98,5 @@ FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t); #endif /* !flstring_h */ /* - * End of "$Id: flstring.h,v 1.1.2.8 2002/07/14 19:08:25 easysw Exp $". + * End of "$Id: flstring.h,v 1.1.2.9 2002/07/17 06:09:26 matthiaswm Exp $". */ |