From e20773fa577154d9d5338cecf5f0912d1c9514cc Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Thu, 9 Sep 2004 21:34:48 +0000 Subject: Quartz port: - removed all #warning statemnets and explained caveats with regular // warning lines - made GL text rendering work again (may use wrong fonts since agl doesn't really support ATS) - removed horizontal jittering in Fl_Input_ caused by fractional text positions. Unfortunatly, this does not work for Fl_Text_Display, which not only jitters, but also became horendously slow due to the complex font rendering in Quartz) I will fix some of the speed issues in fl_measure this afternoon, and also improve on the 'innards' for rgb data rendering. After that, I will have to leave the Quartz port alone for a while due to lack of time. I suggest we make another rc in the next days. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3812 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_mac.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/Fl_mac.cxx') diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 07a80e392..faf6dde4c 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.63 2004/08/31 22:00:48 matthiaswm Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.64 2004/09/09 21:34:46 matthiaswm Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -36,6 +36,10 @@ // One Compile to copy them all and in the bundle bind them, // in the Land of MacOS X where the Drop-Shadows lie. +// warning: the Apple Quartz version still uses some Quickdraw calls, +// mostly to get around the single active context in QD and +// to implement clipping. This should be changed into pure +// Quartz calls in the near future. // we don't need the following definition because we deliver only // true mouse moves. On very slow systems however, this flag may @@ -56,10 +60,6 @@ extern "C" { #include "flstring.h" #include -#ifdef __APPLE_QUARTZ__ -#warning quartz -#endif - // #define DEBUG_SELECT // UNCOMMENT FOR SELECT()/THREAD DEBUGGING #ifdef DEBUG_SELECT #include // testing @@ -1867,7 +1867,6 @@ void Fl_Window::make_current() fl_clip_region( 0 ); SetPortClipRegion( GetWindowPort(i->xid), fl_window_region ); #ifdef __APPLE_QUARTZ__ -#warning : bracket all the QD stuff above with ifdefs! QDBeginCGContext(GetWindowPort(i->xid), &i->gc); fl_gc = i->gc; CGContextSaveGState(fl_gc); @@ -2014,6 +2013,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.63 2004/08/31 22:00:48 matthiaswm Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.64 2004/09/09 21:34:46 matthiaswm Exp $". // -- cgit v1.2.3