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

40 files changed, 78 insertions, 78 deletions

diff --git a/ide/VisualC2008/CubeView.vcproj b/ide/VisualC2008/CubeView.vcproj
index 3791843c7..2e6c73783 100644
--- 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
index b045aeb4d..7b31bbc93 100644
--- 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
index 3ba97923a..cecc42d4a 100644
--- 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
index 7c84457b3..3a98dcfa3 100644
--- 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
index c8463562a..72a837fa4 100644
--- 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
index ac9e62fe6..cbb32f6f7 100644
--- 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
index dd67b40f5..63c1d3755 100644
--- 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"

diff --git a/ide/VisualC2008/browser.vcproj b/ide/VisualC2008/browser.vcproj
index 3a882ef92..e4b94d920 100644
--- a/ide/VisualC2008/browser.vcproj
+++ b/ide/VisualC2008/browser.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=".\browser_/browser.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/browser.pch"

diff --git a/ide/VisualC2008/button.vcproj b/ide/VisualC2008/button.vcproj
index a1ff7e464..acd77200c 100644
--- a/ide/VisualC2008/button.vcproj
+++ b/ide/VisualC2008/button.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=".\button_/button.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/button.pch"

diff --git a/ide/VisualC2008/buttons.vcproj b/ide/VisualC2008/buttons.vcproj
index e2a72f8ac..ae85525c4 100644
--- a/ide/VisualC2008/buttons.vcproj
+++ b/ide/VisualC2008/buttons.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=".\buttons_/buttons.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/buttons.pch"

diff --git a/ide/VisualC2008/cairo_test.vcproj b/ide/VisualC2008/cairo_test.vcproj
index 9bb79a485..a73603f94 100644
--- a/ide/VisualC2008/cairo_test.vcproj
+++ b/ide/VisualC2008/cairo_test.vcproj
@@ -236,7 +236,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".,../.."

-				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"

 				MinimalRebuild="true"

 				RuntimeLibrary="3"

 				PrecompiledHeaderFile=".\cairo_test_/cairo_test.pch"

@@ -332,7 +332,7 @@
 				InlineFunctionExpansion="2"

 				FavorSizeOrSpeed="2"

 				AdditionalIncludeDirectories=".,../.."

-				PreprocessorDefinitions="HAVE_CAIRO=1,WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				PreprocessorDefinitions="FLTK_HAVE_CAIRO=1,WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

 				RuntimeLibrary="2"

 				PrecompiledHeaderFile=".\Release/cairo_test.pch"

 				AssemblerListingLocation=".\Release/"

diff --git a/ide/VisualC2008/checkers.vcproj b/ide/VisualC2008/checkers.vcproj
index a794b1b12..9485367e7 100644
--- a/ide/VisualC2008/checkers.vcproj
+++ b/ide/VisualC2008/checkers.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=".\checkers_/checkers.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/checkers.pch"

diff --git a/ide/VisualC2008/clock.vcproj b/ide/VisualC2008/clock.vcproj
index db21f65bf..1a8662d31 100644
--- a/ide/VisualC2008/clock.vcproj
+++ b/ide/VisualC2008/clock.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=".\clock_/clock.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/clock.pch"

diff --git a/ide/VisualC2008/colbrowser.vcproj b/ide/VisualC2008/colbrowser.vcproj
index eb9340945..47a58d3ec 100644
--- a/ide/VisualC2008/colbrowser.vcproj
+++ b/ide/VisualC2008/colbrowser.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=".\colbrowser_/colbrowser.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/colbrowser.pch"

diff --git a/ide/VisualC2008/color_chooser.vcproj b/ide/VisualC2008/color_chooser.vcproj
index ed50841f3..585c902e5 100644
--- a/ide/VisualC2008/color_chooser.vcproj
+++ b/ide/VisualC2008/color_chooser.vcproj
@@ -232,7 +232,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=".\color_chooser_/color_chooser.pch"

@@ -326,7 +326,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/color_chooser.pch"

diff --git a/ide/VisualC2008/config.h b/ide/VisualC2008/config.h
index fa53ab3e1..fe9b47114 100644
--- a/ide/VisualC2008/config.h
+++ b/ide/VisualC2008/config.h
@@ -182,7 +182,7 @@
  */

 

 // uncomment the following for using cairo

-// #define HAVE_CAIRO 1

+// #define FLTK_HAVE_CAIRO 1

 

 /*

  * Which header file do we include for libpng?

diff --git a/ide/VisualC2008/cube.vcproj b/ide/VisualC2008/cube.vcproj
index c41cb9ffc..a3d6fc338 100644
--- a/ide/VisualC2008/cube.vcproj
+++ b/ide/VisualC2008/cube.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=".\cube_/cube.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/cube.pch"

diff --git a/ide/VisualC2008/cursor.vcproj b/ide/VisualC2008/cursor.vcproj
index 0b7212099..0e5672a77 100644
--- a/ide/VisualC2008/cursor.vcproj
+++ b/ide/VisualC2008/cursor.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=".\cursor_/cursor.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/cursor.pch"

diff --git a/ide/VisualC2008/curve.vcproj b/ide/VisualC2008/curve.vcproj
index fd3fb8ff7..865bd6ca7 100644
--- a/ide/VisualC2008/curve.vcproj
+++ b/ide/VisualC2008/curve.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=".\curve_/curve.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/curve.pch"

diff --git a/ide/VisualC2008/demo.vcproj b/ide/VisualC2008/demo.vcproj
index d8ebf8520..d8ca6b169 100644
--- a/ide/VisualC2008/demo.vcproj
+++ b/ide/VisualC2008/demo.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=".\demo_/demo.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/demo.pch"

diff --git a/ide/VisualC2010/CubeView.vcxproj b/ide/VisualC2010/CubeView.vcxproj
index abd4666b0..e6e2f4719 100644
--- a/ide/VisualC2010/CubeView.vcxproj
+++ b/ide/VisualC2010/CubeView.vcxproj
@@ -171,7 +171,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -217,7 +217,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/adjuster.vcxproj b/ide/VisualC2010/adjuster.vcxproj
index 500ad066b..dfc2b2ad3 100644
--- a/ide/VisualC2010/adjuster.vcxproj
+++ b/ide/VisualC2010/adjuster.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/arc.vcxproj b/ide/VisualC2010/arc.vcxproj
index 9862c1f53..612fb09c4 100644
--- a/ide/VisualC2010/arc.vcxproj
+++ b/ide/VisualC2010/arc.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/ask.vcxproj b/ide/VisualC2010/ask.vcxproj
index 52b6cda6f..41d5f9123 100644
--- a/ide/VisualC2010/ask.vcxproj
+++ b/ide/VisualC2010/ask.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/bitmap.vcxproj b/ide/VisualC2010/bitmap.vcxproj
index 0858df4e0..16905ce60 100644
--- a/ide/VisualC2010/bitmap.vcxproj
+++ b/ide/VisualC2010/bitmap.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/blocks.vcxproj b/ide/VisualC2010/blocks.vcxproj
index 3f84c8dc4..2d72aa8b9 100644
--- a/ide/VisualC2010/blocks.vcxproj
+++ b/ide/VisualC2010/blocks.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/boxtype.vcxproj b/ide/VisualC2010/boxtype.vcxproj
index 58ea6ff67..9b210337c 100644
--- a/ide/VisualC2010/boxtype.vcxproj
+++ b/ide/VisualC2010/boxtype.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/browser.vcxproj b/ide/VisualC2010/browser.vcxproj
index f786ad763..11b26f3bf 100644
--- a/ide/VisualC2010/browser.vcxproj
+++ b/ide/VisualC2010/browser.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/button.vcxproj b/ide/VisualC2010/button.vcxproj
index 4d6042c5f..434023446 100644
--- a/ide/VisualC2010/button.vcxproj
+++ b/ide/VisualC2010/button.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/buttons.vcxproj b/ide/VisualC2010/buttons.vcxproj
index f2801ea9b..e7a396a5e 100644
--- a/ide/VisualC2010/buttons.vcxproj
+++ b/ide/VisualC2010/buttons.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/cairo_test.vcxproj b/ide/VisualC2010/cairo_test.vcxproj
index 111508b42..b6c557a67 100644
--- a/ide/VisualC2010/cairo_test.vcxproj
+++ b/ide/VisualC2010/cairo_test.vcxproj
@@ -174,7 +174,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeaderOutputFile>.\cairo_test_/cairo_test.pch</PrecompiledHeaderOutputFile>

@@ -222,7 +222,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeaderOutputFile>.\Release/cairo_test.pch</PrecompiledHeaderOutputFile>

       <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

diff --git a/ide/VisualC2010/checkers.vcxproj b/ide/VisualC2010/checkers.vcxproj
index d1aac91af..303d52951 100644
--- a/ide/VisualC2010/checkers.vcxproj
+++ b/ide/VisualC2010/checkers.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/clock.vcxproj b/ide/VisualC2010/clock.vcxproj
index dccdbbb5a..26e74476c 100644
--- a/ide/VisualC2010/clock.vcxproj
+++ b/ide/VisualC2010/clock.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/colbrowser.vcxproj b/ide/VisualC2010/colbrowser.vcxproj
index af8ee0d35..54a17fbf2 100644
--- a/ide/VisualC2010/colbrowser.vcxproj
+++ b/ide/VisualC2010/colbrowser.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/color_chooser.vcxproj b/ide/VisualC2010/color_chooser.vcxproj
index 7f49c5330..e3f8dd3ea 100644
--- a/ide/VisualC2010/color_chooser.vcxproj
+++ b/ide/VisualC2010/color_chooser.vcxproj
@@ -168,7 +168,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -213,7 +213,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/config.h b/ide/VisualC2010/config.h
index fa53ab3e1..fe9b47114 100644
--- a/ide/VisualC2010/config.h
+++ b/ide/VisualC2010/config.h
@@ -182,7 +182,7 @@
  */

 

 // uncomment the following for using cairo

-// #define HAVE_CAIRO 1

+// #define FLTK_HAVE_CAIRO 1

 

 /*

  * Which header file do we include for libpng?

diff --git a/ide/VisualC2010/cube.vcxproj b/ide/VisualC2010/cube.vcxproj
index f0d7cee9a..57d6871f4 100644
--- a/ide/VisualC2010/cube.vcxproj
+++ b/ide/VisualC2010/cube.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/cursor.vcxproj b/ide/VisualC2010/cursor.vcxproj
index 4d83359ba..c61db7f2f 100644
--- a/ide/VisualC2010/cursor.vcxproj
+++ b/ide/VisualC2010/cursor.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/curve.vcxproj b/ide/VisualC2010/curve.vcxproj
index 2de726d39..bc8dfe73e 100644
--- a/ide/VisualC2010/curve.vcxproj
+++ b/ide/VisualC2010/curve.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/ide/VisualC2010/demo.vcxproj b/ide/VisualC2010/demo.vcxproj
index a0597e173..f7861b24f 100644
--- a/ide/VisualC2010/demo.vcxproj
+++ b/ide/VisualC2010/demo.vcxproj
@@ -170,7 +170,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -216,7 +216,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>.;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>FLTK_HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>