Fix STR #2504 (last 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@8200 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

19 files changed, 37 insertions, 37 deletions

diff --git a/ide/VisualC2008/radio.vcproj b/ide/VisualC2008/radio.vcproj
index afcfc8c12..a5c85f984 100644
--- a/ide/VisualC2008/radio.vcproj
+++ b/ide/VisualC2008/radio.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=".\radio_/radio.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/radio.pch"

diff --git a/ide/VisualC2008/resize.vcproj b/ide/VisualC2008/resize.vcproj
index 1e48e0c60..5f21a2aaa 100644
--- a/ide/VisualC2008/resize.vcproj
+++ b/ide/VisualC2008/resize.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=".\resize_/resize.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/resize.pch"

diff --git a/ide/VisualC2008/resizebox.vcproj b/ide/VisualC2008/resizebox.vcproj
index f3f9fe4d3..d80bb46d0 100644
--- a/ide/VisualC2008/resizebox.vcproj
+++ b/ide/VisualC2008/resizebox.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=".\resizebox_/resizebox.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/resizebox.pch"

diff --git a/ide/VisualC2008/rotated_text.vcproj b/ide/VisualC2008/rotated_text.vcproj
index 0f1221bf5..6b4dd85f7 100644
--- a/ide/VisualC2008/rotated_text.vcproj
+++ b/ide/VisualC2008/rotated_text.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=".\rotated_text_/rotated_text.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/rotated_text.pch"

diff --git a/ide/VisualC2008/scroll.vcproj b/ide/VisualC2008/scroll.vcproj
index b6211d152..1cd3af993 100644
--- a/ide/VisualC2008/scroll.vcproj
+++ b/ide/VisualC2008/scroll.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=".\scroll_/scroll.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/scroll.pch"

diff --git a/ide/VisualC2008/shape.vcproj b/ide/VisualC2008/shape.vcproj
index 2f9b5e3b3..f553b611c 100644
--- a/ide/VisualC2008/shape.vcproj
+++ b/ide/VisualC2008/shape.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=".\shape_/shape.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/shape.pch"

diff --git a/ide/VisualC2008/subwindow.vcproj b/ide/VisualC2008/subwindow.vcproj
index 46ad7868c..0687ebcc5 100644
--- a/ide/VisualC2008/subwindow.vcproj
+++ b/ide/VisualC2008/subwindow.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=".\subwindow_/subwindow.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/subwindow.pch"

diff --git a/ide/VisualC2008/sudoku.vcproj b/ide/VisualC2008/sudoku.vcproj
index 07966953d..6a24d58bb 100644
--- a/ide/VisualC2008/sudoku.vcproj
+++ b/ide/VisualC2008/sudoku.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=".\sudoku_/sudoku.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/sudoku.pch"

diff --git a/ide/VisualC2008/symbols.vcproj b/ide/VisualC2008/symbols.vcproj
index 45b4ca171..1001eaf8e 100644
--- a/ide/VisualC2008/symbols.vcproj
+++ b/ide/VisualC2008/symbols.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=".\symbols_/symbols.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/symbols.pch"

diff --git a/ide/VisualC2008/table.vcproj b/ide/VisualC2008/table.vcproj
index f535a5c64..73e7fad6e 100644
--- a/ide/VisualC2008/table.vcproj
+++ b/ide/VisualC2008/table.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=".\table_/table.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=".\Release/table.pch"

diff --git a/ide/VisualC2008/tabs.vcproj b/ide/VisualC2008/tabs.vcproj
index 0a000023b..f66dba716 100644
--- a/ide/VisualC2008/tabs.vcproj
+++ b/ide/VisualC2008/tabs.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=".\tabs_/tabs.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=".\Release/tabs.pch"

diff --git a/ide/VisualC2008/threads.vcproj b/ide/VisualC2008/threads.vcproj
index e51a690de..3f6e5d4e3 100644
--- a/ide/VisualC2008/threads.vcproj
+++ b/ide/VisualC2008/threads.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=".\threads_/threads.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/threads.pch"

diff --git a/ide/VisualC2008/tile.vcproj b/ide/VisualC2008/tile.vcproj
index 98df51717..147962707 100644
--- a/ide/VisualC2008/tile.vcproj
+++ b/ide/VisualC2008/tile.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=".\tile_/tile.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/tile.pch"

diff --git a/ide/VisualC2008/tiled_image.vcproj b/ide/VisualC2008/tiled_image.vcproj
index 73b30d576..c0e8d9126 100644
--- a/ide/VisualC2008/tiled_image.vcproj
+++ b/ide/VisualC2008/tiled_image.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=".\tiled_image_/tiled_image.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/tiled_image.pch"

diff --git a/ide/VisualC2008/tree.vcproj b/ide/VisualC2008/tree.vcproj
index 9332b5cb9..ac19dda73 100644
--- a/ide/VisualC2008/tree.vcproj
+++ b/ide/VisualC2008/tree.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=".\tree_/tree.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=".\Release/tree.pch"

diff --git a/ide/VisualC2008/unittests.vcproj b/ide/VisualC2008/unittests.vcproj
index c6486fd6d..13b52479e 100644
--- a/ide/VisualC2008/unittests.vcproj
+++ b/ide/VisualC2008/unittests.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=".\unittest_/unittest.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=".\Release/unittest.pch"

diff --git a/ide/VisualC2008/utf8.vcproj b/ide/VisualC2008/utf8.vcproj
index e6318f46f..4ff9fdc50 100644
--- a/ide/VisualC2008/utf8.vcproj
+++ b/ide/VisualC2008/utf8.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=".\utf8_/utf8.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=".\Release/utf8.pch"

diff --git a/ide/VisualC2008/valuators.vcproj b/ide/VisualC2008/valuators.vcproj
index 48d614d40..c10793432 100644
--- a/ide/VisualC2008/valuators.vcproj
+++ b/ide/VisualC2008/valuators.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=".\valuators_/valuators.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/valuators.pch"

diff --git a/ide/VisualC2008/zlib.vcproj b/ide/VisualC2008/zlib.vcproj
index d74924558..eecc999e7 100644
--- a/ide/VisualC2008/zlib.vcproj
+++ b/ide/VisualC2008/zlib.vcproj
@@ -183,7 +183,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;../.."

-				PreprocessorDefinitions="HAVE_CAIRO=1"

+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Debug/zlib.pch"