Fix STR #2504 (first part). Replaced HAVE _CAIRO by FLTK_HAVE_CAIRO a…

…nd USE_CAIRO by FLTK_USE_CAIRO everywhere. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8198 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
cinecert · Jan 6, 2011 · bc509d3 · bc509d3
1 parent ead3432
commit bc509d3
Show file tree

Hide file tree

Showing 62 changed files with 134 additions and 131 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -361,15 +361,15 @@ if(OPTION_CAIRO OR OPTION_CAIROEXT AND LIB_CAIRO)
 endif(OPTION_CAIRO OR OPTION_CAIROEXT AND LIB_CAIRO)
 
 if(PKG_CAIRO_FOUND)
-   set(HAVE_CAIRO 1)
+   set(FLTK_HAVE_CAIRO 1)
    add_subdirectory(cairo)
    list(APPEND FLTK_LDLIBS -lcairo -lpixman-1)
    include_directories(${PKG_CAIRO_INCLUDE_DIRS})
    string(REPLACE ";" " " CAIROFLAGS "${PKG_CAIRO_CFLAGS}")
 endif(PKG_CAIRO_FOUND)
 
 if(LIB_CAIRO AND OPTION_CAIROEXT AND PKG_CAIRO_FOUND)
-   set(USE_CAIRO 1)
+   set(FLTK_USE_CAIRO 1)
    set(FLTK_CAIRO_FOUND TRUE)
 else()
    set(FLTK_CAIRO_FOUND FALSE)

diff --git 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
@@ -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
@@ -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
 
 //

diff --git a/README.Cairo.txt b/README.Cairo.txt
@@ -39,7 +39,7 @@ as in fltk2.
 
 All the changes are *inactive*  as long as the new configuration
 option --enable-cairo is not added to the configure command.
-For non configure based platforms/ide, the HAVE_CAIRO preprocess var.
+For non configure based platforms/ide, the FLTK_HAVE_CAIRO preprocess var.
 has to be defined.
 All configure based build files has now this feature integrated,
 also vc2005 build files have 2 new build modes "Release Cairo" and 
@@ -79,7 +79,7 @@ in the Modules section.
 -----------------------
 
 From Bill:
-First there is the HAVE_CAIRO configuration option. This indicates that
+First there is the FLTK_HAVE_CAIRO configuration option. This indicates that
 any cairo calls are available. In this case you get something like this:
 
 // static variable holding the last cairo context fltk set:
@@ -95,14 +95,14 @@ void Fl::cairo_make_current(Fl_Window*)
 // thus cannot be destroyed or reused for a different window:
 void Fl::cairo_make_current(cairo_t*)
 
-Second there is the USE_CAIRO configuration option. This means that all
+Second there is the FLTK_USE_CAIRO configuration option. This means that all
 drawing is done using Cairo. In this case when a widget draw() method is
 called, it is exactly as though cairo_make_current(window) has been done.
 *** 
 
-Note that it should be possible to compile so HAVE_CAIRO works even if
-USE_CAIRO does not, and so that turning on USE_CAIRO does not break any
-programs written for HAVE_CAIRO.
+Note that it should be possible to compile so FLTK_HAVE_CAIRO works even if
+FLTK_USE_CAIRO does not, and so that turning on FLTK_USE_CAIRO does not break any
+programs written for FLTK_HAVE_CAIRO.
 
 
  DOCUMENT HISTORY

diff --git a/cairo/Fl_Cairo.cxx b/cairo/Fl_Cairo.cxx
@@ -27,10 +27,13 @@
 
 #include <config.h>
 
-#ifdef HAVE_CAIRO
+#ifdef FLTK_HAVE_CAIRO
 #include <FL/Fl.H>
 #include <FL/x.H>
 #include <FL/Fl_Window.H>
+#ifdef __APPLE__
+#include <Carbon/Carbon.h>
+#endif
 
 // static Fl module initialization :
 Fl_Cairo_State Fl::cairo_state_;	///< contains all necesary info for current cairo context mapping
@@ -41,7 +44,7 @@ Fl_Cairo_State Fl::cairo_state_;	///< contains all necesary info for current cai
 // Fl_Cairo_State class impl
 
 void  Fl_Cairo_State::autolink(bool b)  {
-#ifdef USE_CAIRO
+#ifdef FLTK_USE_CAIRO
   autolink_ = b;
 #else
   Fl::fatal("In Fl::autolink(bool) : Cairo autolink() feature is only "
@@ -116,7 +119,7 @@ cairo_t * Fl::cairo_make_current(void *gc) {
 #elif defined(__APPLE_QUARTZ__) 
     if (fl_window) {
       Rect portRect; 
-      GetPortBounds(GetWindowPort( fl_window ), &portRect);
+      GetPortBounds(GetWindowPort( Fl_X::i(Fl_Window::current())->window_ref() ), &portRect);
       W = portRect.right-portRect.left;
       H = portRect.bottom-portRect.top;
     } 
@@ -159,7 +162,7 @@ cairo_t * Fl::cairo_make_current(void *gc, int W, int H) {
 // just don't leave the libfltk_cairo lib empty to avoid warnings
 #include <FL/Fl_Export.H>
 FL_EXPORT int fltk_cairo_dummy() { return 1;}
-#endif // HAVE_CAIRO
+#endif // FLTK_HAVE_CAIRO
 
 //
 // End of "$Id$" .

diff --git a/configh.cmake.in b/configh.cmake.in
@@ -245,21 +245,21 @@
 #cmakedefine HAVE_LIBJPEG @HAVE_LIBJPEG@
 
 /*
- * USE_CAIRO
+ * FLTK_USE_CAIRO
  *
  * Do we have the cairo library available and want extended cairo use in fltk ?
  * will implies to link cairo.lib in all fltk based apps.
  */
 
-#cmakedefine USE_CAIRO @USE_CAIRO@
+#cmakedefine FLTK_USE_CAIRO @FLTK_USE_CAIRO@
 
 /*
- * HAVE_CAIRO
+ * FLTK_HAVE_CAIRO
  *
  * Do we have the cairo library available?
  */
 
-#cmakedefine HAVE_CAIRO @HAVE_CAIRO@
+#cmakedefine FLTK_HAVE_CAIRO @FLTK_HAVE_CAIRO@
 
 /*
  * Which header file do we include for libpng?

diff --git a/configh.in b/configh.in
@@ -245,21 +245,21 @@
 #undef HAVE_LIBJPEG
 
 /*
- * USE_CAIRO
+ * FLTK_USE_CAIRO
  *
  * Do we have the cairo library available and want extended cairo use in fltk ?
  * will implies to link cairo.lib in all fltk based apps.
  */
 
-#undef USE_CAIRO
+#undef FLTK_USE_CAIRO
 
 /*
- * HAVE_CAIRO
+ * FLTK_HAVE_CAIRO
  *
  * Do we have the cairo library available?
  */
 
-#undef HAVE_CAIRO
+#undef FLTK_HAVE_CAIRO
 
 /*
  * Which header file do we include for libpng?

diff --git a/configure.in b/configure.in
@@ -144,8 +144,8 @@ AC_ARG_ENABLE(cairoext,[  --enable-cairoext       use fltk code instrumentation
 AC_ARG_ENABLE(cairo,[  --enable-cairo          use lib Cairo  (default=no)])
 
 if test x$enable_cairoext = xyes; then
-	  AC_DEFINE(USE_CAIRO)
-	  AC_DEFINE(HAVE_CAIRO)
+	  AC_DEFINE(FLTK_USE_CAIRO)
+	  AC_DEFINE(FLTK_HAVE_CAIRO)
 	  dnl FIXME This part should be fixed so configure do not depend on
 	  dnl we do not rely on pkg-config .
 	  CAIRODIR="cairo"
@@ -159,7 +159,7 @@ if test x$enable_cairoext = xyes; then
 	  LINKFLTK+=" $LINKFLTKCAIRO"
 else 
     if test x$enable_cairo = xyes; then
-	  AC_DEFINE(HAVE_CAIRO)
+	  AC_DEFINE(FLTK_HAVE_CAIRO)
 	  dnl FIXME This part should be fixed so configure do not depend on
 	  dnl we do not rely on pkg-config .
 	  CAIRODIR="cairo"

diff --git a/documentation/Doxybook b/documentation/Doxybook
@@ -1237,7 +1237,7 @@ INCLUDE_FILE_PATTERNS  =
 # instead of the = operator.
 
 PREDEFINED             = FL_DOXYGEN \
-                         HAVE_CAIRO \
+                         FLTK_HAVE_CAIRO \
                          HAVE_GL \
                          HAVE_GL_OVERLAY \
                          FL_EXPORT:= \

diff --git a/documentation/Doxyfile b/documentation/Doxyfile
@@ -1237,7 +1237,7 @@ INCLUDE_FILE_PATTERNS  =
 # instead of the = operator.
 
 PREDEFINED             = FL_DOXYGEN \
-                         HAVE_CAIRO \
+                         FLTK_HAVE_CAIRO \
                          HAVE_GL \
                          HAVE_GL_OVERLAY \
                          FL_EXPORT:= \

diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
@@ -25,9 +25,9 @@ add_executable(fluid ${CPPFILES})
 target_link_libraries(fluid fltk fltk_images fltk_forms)
 
 # link in optional libraries
-if(HAVE_CAIRO)
+if(FLTK_HAVE_CAIRO)
    target_link_libraries(fluid fltk_cairo)
-endif(HAVE_CAIRO)
+endif(FLTK_HAVE_CAIRO)
 
 if(FLTK_USE_GL)
    target_link_libraries(fluid fltk_gl)

diff --git a/ide/VisualC2008/CubeView.vcproj b/ide/VisualC2008/CubeView.vcproj
@@ -235,7 +235,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\CubeView__0/CubeView.pch"
@@ -330,7 +330,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\CubeView___/CubeView.pch"

diff --git a/ide/VisualC2008/adjuster.vcproj b/ide/VisualC2008/adjuster.vcproj
@@ -234,7 +234,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\adjuster_/adjuster.pch"
@@ -329,7 +329,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/adjuster.pch"

diff --git a/ide/VisualC2008/arc.vcproj b/ide/VisualC2008/arc.vcproj
@@ -234,7 +234,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\arc_/arc.pch"
@@ -329,7 +329,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/arc.pch"

diff --git a/ide/VisualC2008/ask.vcproj b/ide/VisualC2008/ask.vcproj
@@ -234,7 +234,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\ask_/ask.pch"
@@ -329,7 +329,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/ask.pch"

diff --git a/ide/VisualC2008/bitmap.vcproj b/ide/VisualC2008/bitmap.vcproj
@@ -234,7 +234,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\bitmap_/bitmap.pch"
@@ -329,7 +329,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/bitmap.pch"

diff --git a/ide/VisualC2008/blocks.vcproj b/ide/VisualC2008/blocks.vcproj
@@ -234,7 +234,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\blocks_/blocks.pch"
@@ -329,7 +329,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/blocks.pch"

diff --git a/ide/VisualC2008/boxtype.vcproj b/ide/VisualC2008/boxtype.vcproj
@@ -234,7 +234,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\boxtype_/boxtype.pch"
@@ -329,7 +329,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."
-				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/boxtype.pch"