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

1 files changed, 7 insertions, 8 deletions

diff --git a/src/Fl.cxx b/src/Fl.cxx
index 80129c998..00924a3f0 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl.cxx,v 1.24.2.41.2.66 2004/08/31 22:00:45 matthiaswm Exp $"
+// "$Id: Fl.cxx,v 1.24.2.41.2.67 2004/09/09 21:34:45 matthiaswm Exp $"
 //
 // Main event handling code for the Fast Light Tool Kit (FLTK).
 //
@@ -23,6 +23,11 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //
 
+// 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.
+
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/x.H>
@@ -320,7 +325,6 @@ Fl_Window* fl_find(Window xid) {
 #ifdef __APPLE_QD__
     if (window->xid == xid && !window->w->window()) {
 #elif defined(__APPLE_QUARTZ__)
-#   warning QUARTZ
     if (window->xid == xid && !window->w->window()) {
 #else
     if (window->xid == xid) {
@@ -747,7 +751,6 @@ void Fl_Window::hide() {
     if ( pc->xidChildren == ip ) pc->xidChildren = ip->xidNext;   
   }
 #elif defined(__APPLE_QUARTZ__)
-# warning quartz
   // remove all childwindow links
   for ( Fl_X *pc = Fl_X::first; pc; pc = pc->next )
   {
@@ -790,7 +793,6 @@ void Fl_Window::hide() {
   if ( ip->xid == fl_window )
     fl_window = 0;
 #elif defined(__APPLE_QUARTZ__)
-# warning quartz
   Fl_X::q_release_context(ip);
   if ( ip->xid == fl_window )
     fl_window = 0;
@@ -806,7 +808,6 @@ void Fl_Window::hide() {
     XDestroyWindow(fl_display, ip->xid);
   }
 #elif defined(__APPLE_QUARTZ__)
-# warning quartz
   if ( !parent() ) // don't destroy shared windows!
   {
     //+ RemoveTrackingHandler( dndTrackingHandler, ip->xid );
@@ -865,7 +866,6 @@ int Fl_Window::handle(int ev)
         hide();
 	set_visible();
 #elif defined(__APPLE_QUARTZ__)
-# warning quartz
         hide();
         set_visible();
 #else
@@ -992,7 +992,6 @@ void Fl_Widget::damage(uchar fl, int X, int Y, int W, int H) {
       UnionRgn(R, i->region, i->region);
       DisposeRgn(R);
 #elif defined(__APPLE_QUARTZ__)
-#  warning quartz
       Fl_Region R = NewRgn();
       SetRectRgn(R, X, Y, X+W, Y+H);
       UnionRgn(R, i->region, i->region);
@@ -1021,5 +1020,5 @@ void Fl_Window::flush() {
 }
 
 //
-// End of "$Id: Fl.cxx,v 1.24.2.41.2.66 2004/08/31 22:00:45 matthiaswm Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.41.2.67 2004/09/09 21:34:45 matthiaswm Exp $".
 //