First steps in CodeWarrior on OS_X support.
(Praise the day when I finally stop screwing up cvs ;-/ ) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2536 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
parent
c48c20c49c
commit
dfefc7b244
2
CHANGES
2
CHANGES
@ -1,5 +1,7 @@
|
||||
CHANGES IN FLTK 1.1.0
|
||||
|
||||
- Added first steps to CodeWarrior/OS_X support (see
|
||||
fltk-1.1.x/CodeWarrior/OS_X.sit)
|
||||
- Cleaned up the WIN32 export definitions for some of
|
||||
the widget classes.
|
||||
- Fixed a filename completion bug when changing
|
||||
|
||||
BIN
CodeWarrior/OS_X.sit
Normal file
BIN
CodeWarrior/OS_X.sit
Normal file
Binary file not shown.
8
FL/Fl.H
8
FL/Fl.H
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl.H,v 1.8.2.11.2.17 2002/07/14 19:08:25 easysw Exp $"
|
||||
// "$Id: Fl.H,v 1.8.2.11.2.18 2002/07/17 06:09:25 matthiaswm Exp $"
|
||||
//
|
||||
// Main header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -31,6 +31,10 @@
|
||||
# define Fl_Object Fl_Widget
|
||||
# endif
|
||||
|
||||
# ifdef check
|
||||
# undef check
|
||||
# endif
|
||||
|
||||
class Fl_Widget;
|
||||
class Fl_Window;
|
||||
class Fl_Image;
|
||||
@ -253,5 +257,5 @@ public:
|
||||
#endif // !Fl_H
|
||||
|
||||
//
|
||||
// End of "$Id: Fl.H,v 1.8.2.11.2.17 2002/07/14 19:08:25 easysw Exp $".
|
||||
// End of "$Id: Fl.H,v 1.8.2.11.2.18 2002/07/17 06:09:25 matthiaswm Exp $".
|
||||
//
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.2 2002/01/01 15:11:28 easysw Exp $"
|
||||
// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.3 2002/07/17 06:09:25 matthiaswm Exp $"
|
||||
//
|
||||
// Menu item header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -31,6 +31,10 @@
|
||||
#include "Fl_Widget.H"
|
||||
#endif
|
||||
|
||||
#if defined __APPLE__ && defined __MWERKS__
|
||||
# undef check
|
||||
#endif
|
||||
|
||||
enum { // values for flags:
|
||||
FL_MENU_INACTIVE = 1,
|
||||
FL_MENU_TOGGLE= 2,
|
||||
@ -153,5 +157,5 @@ enum { // back-compatability enum:
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.2 2002/01/01 15:11:28 easysw Exp $".
|
||||
// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.3 2002/07/17 06:09:25 matthiaswm Exp $".
|
||||
//
|
||||
|
||||
18
FL/math.h
18
FL/math.h
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: math.h,v 1.4.2.4.2.3 2002/06/29 00:10:04 matthiaswm Exp $"
|
||||
// "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $"
|
||||
//
|
||||
// Math header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -28,6 +28,20 @@
|
||||
|
||||
# include <math.h>
|
||||
|
||||
|
||||
# if defined __APPLE__ && defined __MWERKS__
|
||||
|
||||
# define M_PI 3.14159265358979323846
|
||||
# define M_PI_2 1.57079632679489661923
|
||||
# define M_PI_4 0.78539816339744830962
|
||||
# define M_1_PI 0.31830988618379067154
|
||||
# define M_2_PI 0.63661977236758134308
|
||||
# define M_SQRT2 1.41421356237309504880
|
||||
# define M_SQRT1_2 0.70710678118654752440
|
||||
|
||||
# endif
|
||||
|
||||
|
||||
# ifdef WIN32
|
||||
// things missing from <math.h>:
|
||||
|
||||
@ -54,5 +68,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;}
|
||||
|
||||
|
||||
//
|
||||
// End of "$Id: math.h,v 1.4.2.4.2.3 2002/06/29 00:10:04 matthiaswm Exp $".
|
||||
// End of "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $".
|
||||
//
|
||||
|
||||
@ -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 $".
|
||||
//
|
||||
|
||||
@ -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 $".
|
||||
//
|
||||
|
||||
@ -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 $".
|
||||
//
|
||||
|
||||
|
||||
@ -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 $".
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user