summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-01-06 10:24:58 +0000
committerManolo Gouy <Manolo>2011-01-06 10:24:58 +0000
commitbc509d32eb741e5d3876eaaf0abd270cf68cd3b4 (patch)
tree54dc5262309cd9a5d89812f6f3ac42439ffc2f2e /FL
parentead3432f9b9629f201bba47e1b3fbf25d487eba8 (diff)
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
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl.H8
-rw-r--r--FL/Fl_Cairo.H4
-rw-r--r--FL/Fl_Cairo_Window.H4
3 files changed, 8 insertions, 8 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index 69b2f3a85..2b4786983 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -32,7 +32,7 @@
#ifndef Fl_H
# define Fl_H
-#ifdef HAVE_CAIRO
+#ifdef FLTK_HAVE_CAIRO
# include <FL/Fl_Cairo.H>
#endif
@@ -1018,14 +1018,14 @@ public:
static void clear_widget_pointer(Fl_Widget const *w);
/** @} */
-#ifdef HAVE_CAIRO
+#ifdef FLTK_HAVE_CAIRO
/** \defgroup group_cairo Cairo support functions and classes
@{
*/
public:
// Cairo support API
static cairo_t * cairo_make_current(Fl_Window* w);
- /** when HAVE_CAIRO is defined and cairo_autolink_context() is true,
+ /** when FLTK_HAVE_CAIRO is defined and cairo_autolink_context() is true,
any current window dc is linked to a current context.
This is not the default, because it may not be necessary
to add cairo support to all fltk supported windows.
@@ -1063,7 +1063,7 @@ private:
public:
/** @} */
-#endif // HAVE_CAIRO
+#endif // FLTK_HAVE_CAIRO
};
diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H
index 4e92e5322..b1f6ac870 100644
--- a/FL/Fl_Cairo.H
+++ b/FL/Fl_Cairo.H
@@ -31,7 +31,7 @@
#ifndef FL_CAIRO_H
# define FL_CAIRO_H
-# ifdef HAVE_CAIRO
+# ifdef FLTK_HAVE_CAIRO
// Cairo is currently supported for the following platforms:
// Win32, Apple Quartz, X11
@@ -89,7 +89,7 @@ private:
/** @} */
-# endif // HAVE_CAIRO
+# endif // FLTK_HAVE_CAIRO
#endif // FL_CAIRO_H
//
diff --git a/FL/Fl_Cairo_Window.H b/FL/Fl_Cairo_Window.H
index 988173836..504176bcf 100644
--- a/FL/Fl_Cairo_Window.H
+++ b/FL/Fl_Cairo_Window.H
@@ -31,7 +31,7 @@
#ifndef FL_CAIRO_WINDOW_H
# define FL_CAIRO_WINDOW_H
-# ifdef HAVE_CAIRO
+# ifdef FLTK_HAVE_CAIRO
// Cairo is currently supported for the following platforms:
// Win32, Apple Quartz, X11
@@ -84,7 +84,7 @@ private:
/** @} */
-# endif // HAVE_CAIRO
+# endif // FLTK_HAVE_CAIRO
#endif // FL_CAIRO_WINDOW_H
//