Cairo increment 2: Finer cairo granularity, less deps, new fltk_cairo lib

 + added new USE_CAIRO config preprocessor def. 
   to differentiate from HAVE_CAIRO so that we can use the cairo lib 
   without forcing the full fltk lib to be linked against it.
   In that case, cairo autolink context functionality which needs fltk lib 
   instrumentation is disabled.
 + added new --enable-cairoext, which correspond to previous --enable-cairo.
   now, --enable-cairo only adds HAVE_CAIRO def. and keeps fltk lib
   from referencing cairo.
   In both cases (--enable-cairo & --enable-cairoext), a new fltk_cairo lib is 
   created. This lib, similarly to local versions of png,jpeg and zlib, 
   is not generated if cairo is not enabled.
 + added cairo to fltk-config : now new --use-cairo flag is available
 + modified all unix like makefiles to now generate minimum cairo deps and also
   new libfltk_cairo lib.
 + added new cairo subdir to permit conditional fltk_cairo lib generation. 
 + vc2005 project minimum update to compile without be broken, but still needs
   to create a similar fltk_cairo independent lib. For now, it works as before
   with a dedicated cairo env. similar to --enable-cairoext context in unix.
 + regression tested ok with cairo disabled on win32, mac osx, mingw.
  


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6462 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 4 insertions, 4 deletions

diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index e889db4d8..c7737213c 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -2351,7 +2351,7 @@ void Fl_Window::make_current()
   fl_gc = i->gc;
   CGContextSaveGState(fl_gc);
   Fl_X::q_fill_context();
-#if defined(HAVE_CAIRO) && defined (__APPLE_QUARTZ__)
+#if defined(USE_CAIRO) && defined (__APPLE_QUARTZ__)
    if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately
 #endif
 
@@ -2359,7 +2359,7 @@ void Fl_Window::make_current()
   fl_clip_region( 0 );
   SetPortClipRegion( GetWindowPort(i->xid), fl_window_region );
 
-#if defined(__APPLE_QUARTZ__) && defined(HAVE_CAIRO)
+#if defined(__APPLE_QUARTZ__) && defined(USE_CAIRO)
   // update the cairo_t context
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this);
 #endif
@@ -2410,8 +2410,8 @@ void Fl_X::q_release_context(Fl_X *x) {
       fprintf(stderr, "Error %d in QDEndCGContext\n", (int)err);
   }
   fl_gc = 0;
-#if defined(HAVE_CAIRO) && defined (__APPLE_QUARTZ__)
-  Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately
+#if defined(USE_CAIRO) && defined (__APPLE_QUARTZ__)
+  if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately
 #endif
 }