From 8327822026ac50dc9e20823988b0f53bc143b7ba Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 25 Aug 2004 00:20:27 +0000 Subject: Updated config stuff to allow for --enable-quartz ofr Mac OS X which in turn defined USE_QUARTZ to 1 and defines __APPLE_QUARTZ__. If Quartz is not disabled, it will define __APPLE_QD__ for Quickdraw. I also replaced all relevand #ifdef __APPLE__ with #ifdef __APPLE_QD__ #elif defined(__APPLE_QUARTZ__). This does not affect the compile at this time and both version will generate the same Quickdraw code. I will start to replace all QD calls with Quartz calls for the remainder of the week until I can completely remove all QD calls from the Quartz branch. Thanks to Robert Smith for a great initial Quartz implementation. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3782 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Window_fullscreen.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/Fl_Window_fullscreen.cxx') diff --git a/src/Fl_Window_fullscreen.cxx b/src/Fl_Window_fullscreen.cxx index ab2dcae8c..09d128151 100644 --- a/src/Fl_Window_fullscreen.cxx +++ b/src/Fl_Window_fullscreen.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window_fullscreen.cxx,v 1.5.2.3.2.6 2004/04/11 04:38:58 easysw Exp $" +// "$Id: Fl_Window_fullscreen.cxx,v 1.5.2.3.2.7 2004/08/25 00:20:26 matthiaswm Exp $" // // Fullscreen window support for the Fast Light Tool Kit (FLTK). // @@ -36,6 +36,10 @@ #include #include +#ifdef __APPLE__ +#include +#endif + void Fl_Window::border(int b) { if (b) { if (border()) return; @@ -47,8 +51,10 @@ void Fl_Window::border(int b) { #ifdef WIN32 // not yet implemented, but it's possible // for full fullscreen we have to make the window topmost as well -#elif defined(__APPLE__) +#elif defined(__APPLE_QD__) // \todo Mac : not yet implemeted +#elif defined(__APPLE_QUARTZ__) +#warning quartz #else if (shown()) Fl_X::i(this)->sendxjunk(); #endif @@ -73,5 +79,5 @@ void Fl_Window::fullscreen_off(int X,int Y,int W,int H) { } // -// End of "$Id: Fl_Window_fullscreen.cxx,v 1.5.2.3.2.6 2004/04/11 04:38:58 easysw Exp $". +// End of "$Id: Fl_Window_fullscreen.cxx,v 1.5.2.3.2.7 2004/08/25 00:20:26 matthiaswm Exp $". // -- cgit v1.2.3