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

8 files changed, 13 insertions, 13 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b613766a8..c0862717d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -231,9 +231,9 @@ if(WIN32)
    target_link_libraries(fltk comctl32)
 endif(WIN32)
 
-if(HAVE_CAIRO)
+if(FLTK_HAVE_CAIRO)
    target_link_libraries(fltk fltk_cairo ${PKG_CAIRO_LIBRARIES})
-ENDif(HAVE_CAIRO)
+ENDif(FLTK_HAVE_CAIRO)
 
 if(HAVE_XINERAMA)
    target_link_libraries(fltk ${X11_Xinerama_LIB})
@@ -345,9 +345,9 @@ if(WIN32)
    target_link_libraries(fltk_SHARED comctl32)
 endif(WIN32)
 
-if(HAVE_CAIRO)
+if(FLTK_HAVE_CAIRO)
    target_link_libraries(fltk_SHARED fltk_cairo ${PKG_CAIRO_LIBRARIES})
-ENDif(HAVE_CAIRO)
+ENDif(FLTK_HAVE_CAIRO)
 
 if(HAVE_XINERAMA)
    target_link_libraries(fltk_SHARED ${X11_Xinerama_LIB})
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 6e0780f66..07c7ff4b7 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1265,7 +1265,7 @@ void Fl_Window::hide() {
       fl_release_dc(fl_window, fl_gc);
       fl_window = (HWND)-1;
       fl_gc = 0;
-# ifdef USE_CAIRO
+# ifdef FLTK_USE_CAIRO
       if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0);
 # endif
     }
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 1df1da37c..9e24a85e4 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -389,7 +389,7 @@ void Fl_Double_Window::flush(int eraseoverlay) {
     RestoreDC(fl_gc, save);
     DeleteDC(fl_gc);
     fl_gc = _sgc;
-    //# 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
 #elif defined(__APPLE__)
diff --git a/src/Fl_Menu_Window.cxx b/src/Fl_Menu_Window.cxx
index 3d8de7c04..39493ec01 100644
--- a/src/Fl_Menu_Window.cxx
+++ b/src/Fl_Menu_Window.cxx
@@ -69,7 +69,7 @@ void Fl_Menu_Window::flush() {
   fl_window = myi->xid;
   if (!gc) {
 	  gc = XCreateGC(fl_display, myi->xid, 0, 0);
-# if defined(USE_CAIRO)
+# if defined(FLTK_USE_CAIRO)
 	  if(Fl::autolink_context()) Fl::cairo_make_current(gc); // capture gc changes automatically to update the cairo context adequately
 # endif
   }
diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx
index bbffcad65..f343f530f 100644
--- a/src/Fl_Overlay_Window.cxx
+++ b/src/Fl_Overlay_Window.cxx
@@ -135,7 +135,7 @@ void _Fl_Overlay::flush() {
 	  gc = XCreateGC(fl_display, fl_xid(this), 0, 0);
   }
   fl_gc = 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_overlay = 1;
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 4c83872ae..f2509a432 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -136,7 +136,7 @@ void Fl_Window::draw() {
   }
 #endif
 
-# if defined(USE_CAIRO)
+# if defined(FLTK_USE_CAIRO)
   Fl::cairo_make_current(this); // checkout if an update is necessary
 # endif
 }
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
 }
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 9d42932ef..9eff16f63 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1869,7 +1869,7 @@ void Fl_Window::make_current() {
   current_ = this;
   fl_clip_region(0);
 
-#ifdef USE_CAIRO
+#ifdef FLTK_USE_CAIRO
   // update the cairo_t context
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this);
 #endif