From bc509d32eb741e5d3876eaaf0abd270cf68cd3b4 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 6 Jan 2011 10:24:58 +0000 Subject: [PATCH] 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 --- CMakeLists.txt | 4 ++-- FL/Fl.H | 8 ++++---- FL/Fl_Cairo.H | 4 ++-- FL/Fl_Cairo_Window.H | 4 ++-- README.Cairo.txt | 12 ++++++------ cairo/Fl_Cairo.cxx | 11 +++++++---- configh.cmake.in | 8 ++++---- configh.in | 8 ++++---- configure.in | 6 +++--- documentation/Doxybook | 2 +- documentation/Doxyfile | 2 +- fluid/CMakeLists.txt | 4 ++-- ide/VisualC2008/CubeView.vcproj | 4 ++-- ide/VisualC2008/adjuster.vcproj | 4 ++-- ide/VisualC2008/arc.vcproj | 4 ++-- ide/VisualC2008/ask.vcproj | 4 ++-- ide/VisualC2008/bitmap.vcproj | 4 ++-- ide/VisualC2008/blocks.vcproj | 4 ++-- ide/VisualC2008/boxtype.vcproj | 4 ++-- ide/VisualC2008/browser.vcproj | 4 ++-- ide/VisualC2008/button.vcproj | 4 ++-- ide/VisualC2008/buttons.vcproj | 4 ++-- ide/VisualC2008/cairo_test.vcproj | 4 ++-- ide/VisualC2008/checkers.vcproj | 4 ++-- ide/VisualC2008/clock.vcproj | 4 ++-- ide/VisualC2008/colbrowser.vcproj | 4 ++-- ide/VisualC2008/color_chooser.vcproj | 4 ++-- ide/VisualC2008/config.h | 2 +- ide/VisualC2008/cube.vcproj | 4 ++-- ide/VisualC2008/cursor.vcproj | 4 ++-- ide/VisualC2008/curve.vcproj | 4 ++-- ide/VisualC2008/demo.vcproj | 4 ++-- ide/VisualC2010/CubeView.vcxproj | 4 ++-- ide/VisualC2010/adjuster.vcxproj | 4 ++-- ide/VisualC2010/arc.vcxproj | 4 ++-- ide/VisualC2010/ask.vcxproj | 4 ++-- ide/VisualC2010/bitmap.vcxproj | 4 ++-- ide/VisualC2010/blocks.vcxproj | 4 ++-- ide/VisualC2010/boxtype.vcxproj | 4 ++-- ide/VisualC2010/browser.vcxproj | 4 ++-- ide/VisualC2010/button.vcxproj | 4 ++-- ide/VisualC2010/buttons.vcxproj | 4 ++-- ide/VisualC2010/cairo_test.vcxproj | 4 ++-- ide/VisualC2010/checkers.vcxproj | 4 ++-- ide/VisualC2010/clock.vcxproj | 4 ++-- ide/VisualC2010/colbrowser.vcxproj | 4 ++-- ide/VisualC2010/color_chooser.vcxproj | 4 ++-- ide/VisualC2010/config.h | 2 +- ide/VisualC2010/cube.vcxproj | 4 ++-- ide/VisualC2010/cursor.vcxproj | 4 ++-- ide/VisualC2010/curve.vcxproj | 4 ++-- ide/VisualC2010/demo.vcxproj | 4 ++-- src/CMakeLists.txt | 8 ++++---- src/Fl.cxx | 2 +- src/Fl_Double_Window.cxx | 2 +- src/Fl_Menu_Window.cxx | 2 +- src/Fl_Overlay_Window.cxx | 2 +- src/Fl_Window.cxx | 2 +- src/Fl_cocoa.mm | 6 +++--- src/Fl_x.cxx | 2 +- test/CMakeLists.txt | 8 ++++---- test/cairo_test.cxx | 2 +- 62 files changed, 134 insertions(+), 131 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1faeaecef..f2c8fa10e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -361,7 +361,7 @@ 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}) @@ -369,7 +369,7 @@ if(PKG_CAIRO_FOUND) 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 index 69b2f3a85..2b4786983 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -32,7 +32,7 @@ #ifndef Fl_H # define Fl_H -#ifdef HAVE_CAIRO +#ifdef FLTK_HAVE_CAIRO # include #endif @@ -1018,14 +1018,14 @@ public: static void clear_widget_pointer(Fl_Widget const *w); /** @} */ -#ifdef HAVE_CAIRO +#ifdef FLTK_HAVE_CAIRO /** \defgroup group_cairo Cairo support functions and classes @{ */ public: // Cairo support API static cairo_t * cairo_make_current(Fl_Window* w); - /** when HAVE_CAIRO is defined and cairo_autolink_context() is true, + /** when FLTK_HAVE_CAIRO is defined and cairo_autolink_context() is true, any current window dc is linked to a current context. This is not the default, because it may not be necessary to add cairo support to all fltk supported windows. @@ -1063,7 +1063,7 @@ private: public: /** @} */ -#endif // HAVE_CAIRO +#endif // FLTK_HAVE_CAIRO }; diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H index 4e92e5322..b1f6ac870 100644 --- a/FL/Fl_Cairo.H +++ b/FL/Fl_Cairo.H @@ -31,7 +31,7 @@ #ifndef FL_CAIRO_H # define FL_CAIRO_H -# ifdef HAVE_CAIRO +# ifdef FLTK_HAVE_CAIRO // Cairo is currently supported for the following platforms: // Win32, Apple Quartz, X11 @@ -89,7 +89,7 @@ private: /** @} */ -# endif // HAVE_CAIRO +# endif // FLTK_HAVE_CAIRO #endif // FL_CAIRO_H // diff --git a/FL/Fl_Cairo_Window.H b/FL/Fl_Cairo_Window.H index 988173836..504176bcf 100644 --- a/FL/Fl_Cairo_Window.H +++ b/FL/Fl_Cairo_Window.H @@ -31,7 +31,7 @@ #ifndef FL_CAIRO_WINDOW_H # define FL_CAIRO_WINDOW_H -# ifdef HAVE_CAIRO +# ifdef FLTK_HAVE_CAIRO // Cairo is currently supported for the following platforms: // Win32, Apple Quartz, X11 @@ -84,7 +84,7 @@ private: /** @} */ -# endif // HAVE_CAIRO +# endif // FLTK_HAVE_CAIRO #endif // FL_CAIRO_WINDOW_H // diff --git a/README.Cairo.txt b/README.Cairo.txt index ba3bdb8bf..38fc6ffa2 100644 --- 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 index ff759e94b..66d955d18 100644 --- a/cairo/Fl_Cairo.cxx +++ b/cairo/Fl_Cairo.cxx @@ -27,10 +27,13 @@ #include -#ifdef HAVE_CAIRO +#ifdef FLTK_HAVE_CAIRO #include #include #include +#ifdef __APPLE__ +#include +#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_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 index 9d45f5ae4..d0718003e 100644 --- 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 index 26f4b2309..c0f95fd69 100644 --- 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 index 9f93584c2..edc538c0c 100644 --- 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 index 158a230cf..0d89313c0 100644 --- 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 index 41b0bd367..ec0020e45 100644 --- 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 index d2d85ae34..57e735200 100644 --- 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 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -217,7 +217,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) true MultiThreadedDebugDLL .\cairo_test_/cairo_test.pch @@ -222,7 +222,7 @@ AnySuitable Size .;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL .\Release/cairo_test.pch .\Release/ 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -213,7 +213,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL 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 @@ Disabled .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -216,7 +216,7 @@ AnySuitable Size .;..\..\zlib;..\..\png;..\..\jpeg;../..;%(AdditionalIncludeDirectories) - 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;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b613766a8..c0862717d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -231,9 +231,9 @@ if(WIN32) target_link_libraries(fltk comctl32) endif(WIN32) -if(HAVE_CAIRO) +if(FLTK_HAVE_CAIRO) target_link_libraries(fltk fltk_cairo ${PKG_CAIRO_LIBRARIES}) -ENDif(HAVE_CAIRO) +ENDif(FLTK_HAVE_CAIRO) if(HAVE_XINERAMA) target_link_libraries(fltk ${X11_Xinerama_LIB}) @@ -345,9 +345,9 @@ if(WIN32) target_link_libraries(fltk_SHARED comctl32) endif(WIN32) -if(HAVE_CAIRO) +if(FLTK_HAVE_CAIRO) target_link_libraries(fltk_SHARED fltk_cairo ${PKG_CAIRO_LIBRARIES}) -ENDif(HAVE_CAIRO) +ENDif(FLTK_HAVE_CAIRO) if(HAVE_XINERAMA) target_link_libraries(fltk_SHARED ${X11_Xinerama_LIB}) diff --git a/src/Fl.cxx b/src/Fl.cxx index 6e0780f66..07c7ff4b7 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1265,7 +1265,7 @@ void Fl_Window::hide() { fl_release_dc(fl_window, fl_gc); fl_window = (HWND)-1; fl_gc = 0; -# ifdef USE_CAIRO +# ifdef FLTK_USE_CAIRO if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); # endif } diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx index 1df1da37c..9e24a85e4 100644 --- a/src/Fl_Double_Window.cxx +++ b/src/Fl_Double_Window.cxx @@ -389,7 +389,7 @@ void Fl_Double_Window::flush(int eraseoverlay) { RestoreDC(fl_gc, save); DeleteDC(fl_gc); fl_gc = _sgc; - //# if defined(USE_CAIRO) + //# if defined(FLTK_USE_CAIRO) //if Fl::cairo_autolink_context() Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately //# endif #elif defined(__APPLE__) diff --git a/src/Fl_Menu_Window.cxx b/src/Fl_Menu_Window.cxx index 3d8de7c04..39493ec01 100644 --- a/src/Fl_Menu_Window.cxx +++ b/src/Fl_Menu_Window.cxx @@ -69,7 +69,7 @@ void Fl_Menu_Window::flush() { fl_window = myi->xid; if (!gc) { gc = XCreateGC(fl_display, myi->xid, 0, 0); -# if defined(USE_CAIRO) +# if defined(FLTK_USE_CAIRO) if(Fl::autolink_context()) Fl::cairo_make_current(gc); // capture gc changes automatically to update the cairo context adequately # endif } diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx index bbffcad65..f343f530f 100644 --- a/src/Fl_Overlay_Window.cxx +++ b/src/Fl_Overlay_Window.cxx @@ -135,7 +135,7 @@ void _Fl_Overlay::flush() { gc = XCreateGC(fl_display, fl_xid(this), 0, 0); } fl_gc = gc; -#if defined(USE_CAIRO) +#if defined(FLTK_USE_CAIRO) if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately #endif fl_overlay = 1; diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index 4c83872ae..f2509a432 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -136,7 +136,7 @@ void Fl_Window::draw() { } #endif -# if defined(USE_CAIRO) +# if defined(FLTK_USE_CAIRO) Fl::cairo_make_current(this); // checkout if an update is necessary # endif } diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 40d0c104f..4dedbcf3e 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2216,12 +2216,12 @@ void Fl_Window::make_current() XDestroyRegion(fl_window_region); // this is the context with origin at top left of (sub)window clipped out of its subwindows if any CGContextSaveGState(fl_gc); -#if defined(USE_CAIRO) +#if defined(FLTK_USE_CAIRO) if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately #endif fl_clip_region( 0 ); -#if defined(USE_CAIRO) +#if defined(FLTK_USE_CAIRO) // update the cairo_t context if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); #endif @@ -2261,7 +2261,7 @@ void Fl_X::q_release_context(Fl_X *x) { if (!fl_gc) return; CGContextRestoreGState(fl_gc); // matches the CGContextSaveGState of make_current fl_gc = 0; -#if defined(USE_CAIRO) +#if defined(FLTK_USE_CAIRO) if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately #endif } diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 9d42932ef..9eff16f63 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1869,7 +1869,7 @@ void Fl_Window::make_current() { current_ = this; fl_clip_region(0); -#ifdef USE_CAIRO +#ifdef FLTK_USE_CAIRO // update the cairo_t context if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); #endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 969b3d642..a2cba8840 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,9 +33,9 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES) target_link_libraries(${NAME} ${LIBRARIES}) # link in optional libraries - if(HAVE_CAIRO) + if(FLTK_HAVE_CAIRO) target_link_libraries(${NAME} fltk_cairo) - endif(HAVE_CAIRO) + endif(FLTK_HAVE_CAIRO) if(USE_XFT) target_link_libraries(${NAME} ${X11_Xft_LIB}) @@ -133,6 +133,6 @@ CREATE_EXAMPLE(shape shape.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}") endif(OPENGL_FOUND) # Cairo demo -if(HAVE_CAIRO) +if(FLTK_HAVE_CAIRO) CREATE_EXAMPLE(cairo_test cairo_test.cxx fltk) -endif(HAVE_CAIRO) +endif(FLTK_HAVE_CAIRO) diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx index 918bb35ff..261cc512c 100644 --- a/test/cairo_test.cxx +++ b/test/cairo_test.cxx @@ -27,7 +27,7 @@ #include -#ifdef HAVE_CAIRO +#ifdef FLTK_HAVE_CAIRO #include #include