From bc509d32eb741e5d3876eaaf0abd270cf68cd3b4 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 6 Jan 2011 10:24:58 +0000
Subject: Fix STR #2504 (first part). Replaced HAVE _CAIRO by FLTK_HAVE_CAIRO
 and USE_CAIRO by FLTK_USE_CAIRO everywhere.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8198 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_cocoa.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Fl_cocoa.mm')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 40d0c104f..4dedbcf3e 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2216,12 +2216,12 @@ void Fl_Window::make_current()
   XDestroyRegion(fl_window_region);
 // this is the context with origin at top left of (sub)window clipped out of its subwindows if any
   CGContextSaveGState(fl_gc); 
-#if defined(USE_CAIRO)
+#if defined(FLTK_USE_CAIRO)
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately
 #endif
   fl_clip_region( 0 );
   
-#if defined(USE_CAIRO)
+#if defined(FLTK_USE_CAIRO)
   // update the cairo_t context
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this);
 #endif
@@ -2261,7 +2261,7 @@ void Fl_X::q_release_context(Fl_X *x) {
   if (!fl_gc) return;
   CGContextRestoreGState(fl_gc); // matches the CGContextSaveGState of make_current
   fl_gc = 0;
-#if defined(USE_CAIRO)
+#if defined(FLTK_USE_CAIRO)
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately
 #endif
 }
-- 
cgit v1.2.3