Define wxUSE_CAIRO in wx/chkconf.h to ensure that it's always defined.

wxUSE_CAIRO used to be defined only in wx/cairo.h but this header wasn't
included by src/common/dcgraph.cpp so the code there was compiled as if we
were not using Cairo even when we were (thanks g++ for the warning).

Define it in wx/chkconf.h (included from wx/defs.h, i.e. always) now to ensure
that not only this bug is fixed but also that it can't happen any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index 8dd9e7556d1a05a5257127796a217603a2390c0e..0d53cca929e16bbd956941cf2d454648b184c57c 100644 (file)
--- a/include/wx/cairo.h
+++ b/include/wx/cairo.h
@@ -11,15 +11,6 @@
 #ifndef _WX_CAIRO_H_BASE_
 #define _WX_CAIRO_H_BASE_
 
-// for now GTK+ only
-#ifndef wxUSE_CAIRO
-    #ifdef __WXGTK210__
-        #define wxUSE_CAIRO 1
-    #else
-        #define wxUSE_CAIRO 0
-    #endif
-#endif
-
 #if wxUSE_CAIRO
 
 #include "wx/dynlib.h"

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 4afa892e073ba0bebf081ff05abe1907c090e710..ccb3fb687a054594b9d6dec21905f9fad4065807 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -431,6 +431,18 @@
 #   endif
 #endif /* !defined(wxUSE_BUTTON) */
 
+/*
+    This one is special, it's only used under wxGTK currently so don't require
+    pre-defining it.
+ */
+#ifndef wxUSE_CAIRO
+#   ifdef __WXGTK210__
+#        define wxUSE_CAIRO 1
+#    else
+#        define wxUSE_CAIRO 0
+#    endif
+#endif
+
 #ifndef wxUSE_CALENDARCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CALENDARCTRL must be defined, please read comment near the top of this file."

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index c6ffbd51d0e441cd9785f001b838d5574275cb27..deb1b8b5e84a57c6580b2c0ecb32b349d45f5abe 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -15,11 +15,11 @@
     #pragma hdrstop
 #endif
 
-#include "wx/cairo.h"
-#include "wx/graphics.h"
-
 #if wxUSE_GRAPHICS_CONTEXT && wxUSE_CAIRO
 
+#include "wx/graphics.h"
+#include "wx/cairo.h"
+
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
     #include "wx/icon.h"