Make the message about wxUSE_GRAPHICS_CONTEXT a bit more informative

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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 6c8370a4de3e46c9db57cdf0f8bb283d1ebd6871..5a29f354e5949a6153785b3ee104f2d65ebed1a6 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -553,10 +553,16 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
 // Default is 0
 //
 // Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 315daf2dc2b671fcc9daff1b7c96b4c8290b592e..a90e2468b19860d79a0465977463303c18f56687 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -552,10 +552,16 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
 // Default is 0
 //
 // Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index b37dac80df7323b109c54dc83c17ec8653eab839..e50b5a727f781c239c16aec73ce465fc39591f9a 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -552,10 +552,16 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
 // Default is 0
 //
 // Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index cadc00ada2b10552a399f34a2b1bc0c320dcc4d2..f4b472cb40711fba19b8b968ad4faaa4696662bd 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -552,10 +552,16 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
 // Default is 0
 //
 // Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 26d0a9c84e69e70f4e72a2849b1de91c9e06f8b0..d03b6e30dc0b814c4415e66b1a285b3fbed8e69b 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -552,10 +552,16 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
 // Default is 0
 //
 // Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 9c48db9f736b551a141cf1a895f1b4fc10599ac0..fae3447bb5df07165a37bad94826dd18c7edfb9a 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -552,10 +552,16 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
 // Default is 0
 //
 // Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index f8d4204416b87904316e677ea9f6f2fe55615371..1f062009d9d8a5f6a55ca6c72368682a875a182d 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -548,10 +548,16 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
 // Default is 0
 //
 // Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/setup.h.in b/setup.h.in
index b8dc454d474c00c35869db8272d8e36f0cf757c0..d9642d465a5662febbc08b48e0d56df6217d74fc 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -294,7 +294,9 @@
 #define wxUSE_AUI       0
 
 
+#ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
 
 #define wxUSE_CONTROLS     0