From dfefc7b244c493ee7c90329882c7f76156f09fae Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 17 Jul 2002 06:09:26 +0000 Subject: [PATCH] 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 --- CHANGES | 2 ++ CodeWarrior/OS_X.sit | Bin 0 -> 36857 bytes FL/Fl.H | 8 ++++++-- FL/Fl_Menu_Item.H | 8 ++++++-- FL/math.h | 18 ++++++++++++++++-- src/Fl_File_Browser.cxx | 9 +++++---- src/Fl_get_system_colors.cxx | 8 ++++++-- src/Fl_mac.cxx | 10 +++++----- src/flstring.h | 14 ++++++++++++-- 9 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 CodeWarrior/OS_X.sit diff --git a/CHANGES b/CHANGES index 8cfeeb9f0..2542e6039 100644 --- a/CHANGES +++ b/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 diff --git a/CodeWarrior/OS_X.sit b/CodeWarrior/OS_X.sit new file mode 100644 index 0000000000000000000000000000000000000000..7f3eb491a60b8afc57dd40f69869e8dbeb91b387 GIT binary patch literal 36857 zcma&MQ*lX4-XG^S$W;^LtDFL4qI*%+FbSlSV)csje7+B(w`O4%9H(-K;^xHxb#Fu1$B z(;NPu3TIDedSiQA29^J#!T=A00|br)1Qh=c1O(&+1pL1;?+<)wsj{iFsgs+jNogri z>3{Jb!3reUsRi-dsU?5=U)BE&uw3c?z$6f4X83J5OK?5-c}NhACqjkZ03&dGPLy{o|&+M!iUB*Xw|v&^*5 zd3%@dS|98f!9ytV&tijU6DAw6KL=4wdCiPcIjG@oRnhM9l56|$nc&x%&>$pVK^A7b zgFL8sKKNXEV{7eu)9AF~2D&=$rv@z6l7ZTaNLAWkOf$l#LTb<%L5Fkb4*d&1Wlv&{ zvIn>yJvM^`;Gws^cCY>6!pm+9HGT&96GqHp^SEEZY-A60jd`Ly&w%`PXN0-cdo7lT zG_Rzo;*{uL7?4K9v5oQ|1i9u(j zw)c7`-U*Wv-F(AnXRe1D(?8?j%I$Jg&xyRhg$7|U%Imu51z+UQTtLxOJZ6gE8o+VS z=r}%ZI!jmwM+zsMt<|g+8(o=kohp=)jN-YxjJUFbr&liEohv30^d$$GDVWsm`88x4 zBX|JNSSb2GrLcIndDXIgDf`XJD2fayw)oF1ZARyr>)C%4Uw2&!Rkx|xc^WoMeE)q4 zXI^VGrOLlN}Qc^TyFoN5+ziq+jKj#?cT;q@^37R;g-ull4Jb`cYied0(gJKP- z#W5SQ=jV_|@BzhSZC5T8iB`|;n4Ibf@wrYXPc(}1&*OTYGg{g@54!cjVx1-9^9#@Y zTDOmi@`-YVm)_aNY=oE{5AA#7)-q}knCPxHJ%xB2Di}J_%RU0Q%nUEl!x8r1{KA`z7)##BNlg|khs5J7+wfgP54d(Nqrq;=ehE^MD`Z;v z9kD6xkkrDJ>VMO#2rP*7R5T8x@og95t|OAd#yngHLGO=9wMWNXA%E`wgQ|L_Ht@&B zDpU`+)c=(uWgW(*Z}SDeyI=UU(vhq=A+4E|bJV`e8yJA{)bD@TlHp6Bw9<2;L=z5i zWqrJ}$dBi*M%2e+GHHA#%ewW$P}=xRLz~{E>1u+HAGkiDv4x(ZxkJfX!Tj2NSV@

qjvjs-@I&SyUV{0J-(-XjAYu^Lj? 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 literal 0 HcmV?d00001 diff --git a/FL/Fl.H b/FL/Fl.H index 370a2c8e2..3e3cdcb46 100644 --- a/FL/Fl.H +++ b/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 $". // diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index 410a03726..28106282b 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -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 $". // diff --git a/FL/math.h b/FL/math.h index 0813b8ea9..6a8eeefa4 100644 --- a/FL/math.h +++ b/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 + +# 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 : @@ -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 $". // 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 #endif // __EMX__ -#ifdef __APPLE__ +// CodeWarrior (__MWERKS__) gets its include paths confused, so we temporarily disable this +#if defined(__APPLE__) && !defined(__MWERKS__) # include # include # include @@ -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 #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 +// 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 $". */