Allow using wxGraphicsContext with MinGW if gdiplus.h is available.

MinGW doesn't include gdiplus.h but it can be installed independently by the
user. Allow to use it if it's available:

- Include windows.h when checking for it in configure as this is apparently
  needed for its compilation.
- Don't reset wxUSE_GRAPHICS_CONTEXT to 0 for non-Microsoft compilers, instead
  just define it as 0 by default for them, allowing the user to simply change
  the definition in wx/msw/setup.h.

Closes #11892.

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

diff --git a/configure b/configure
index fb880bc1821838d7af384c067faeeaffe3f5a950..f6228878d7ffbbb2e7b1d71079f94c2969848748 100755 (executable)
--- a/configure
+++ b/configure
@@ -47506,6 +47506,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

+#include <window.h>

 #include <gdiplus.h>
 int
 main ()
 #include <gdiplus.h>
 int
 main ()

diff --git a/configure.in b/configure.in
index e3b0d891b4e2fa81d1ce0f2c4dd1a15d2a24bb6e..e6bf454aeff8ebd40a4d7c90d081b19ab17674f6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7444,7 +7444,8 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
                 dnl GDI+ DLL dynamically anyhow during run-time
                 AC_LANG_PUSH(C++)
                 AC_TRY_COMPILE(
                 dnl GDI+ DLL dynamically anyhow during run-time
                 AC_LANG_PUSH(C++)
                 AC_TRY_COMPILE(

-                    [#include <gdiplus.h>],
+                    [#include <windows.h>
+                     #include <gdiplus.h>],

                     [
                         using namespace Gdiplus;
                     ],
                     [
                         using namespace Gdiplus;
                     ],

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 22177951f1bb4b37be1affa9a09476aceeedae75..2d21d1239342a385afad2fcdbb62fd372c541b81 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -661,11 +661,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 51aede95436cc694c87d1fa2045c5a0ea009f662..eabc05bdf6e7ce1763c3a9168938bf8fab71b1c7 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -239,15 +239,6 @@
    Compiler-specific checks.
  */
 
    Compiler-specific checks.
  */
 

-// Only MSVC 7+ has gdiplus.h, add exceptions for other compilers here if they
-// can support it too (but notice that Borland currently dies in
-// src/msw/gdiplus.cpp with "macro expansion too long" error even if the header
-// is available)
-#if !wxCHECK_VISUALC_VERSION(7)
-    #undef wxUSE_GRAPHICS_CONTEXT
-    #define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-

 // Borland
 #ifdef __BORLANDC__
 
 // Borland
 #ifdef __BORLANDC__
 

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 0391162f33af23e0429fb65ea2427b1fdb41fe78..e28a11d2712428ea202f025ae02fdcef3129c4ba 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -661,11 +661,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 615d2fa542dd32b3175407a7426923690b3259d1..b63ddda90c56c3d03c34ab5e87101c88aef6f103 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -661,11 +661,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index b3d9ee1af8f4703d7312271259b6c656a7da2b49..40186f83bb7b6e161274f92c267f1fd9f4adece0 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -661,11 +661,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 53c43ce1008050cb691b0e9ac17c8402468f6d8a..b044bbfa6a9b0a828de4d2f9df51763fe8633136 100644 (file)
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -662,11 +662,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 5a235c70e11c688230086614a92a4258b229e585..3f2f2e10cd84a4bec2b43100ebc6935f83733c15 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -661,11 +661,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index fbeb660e29f6ecbc34a51519dc0077f67f232d86..39b22a121921f84b0ebc20bd98678612592a46b0 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -657,11 +657,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index de3c88b727f2e8b1fa664b583f93220927a2ae4a..425ce4c0c409595558b79b0b2df7da62bfb71f3b 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -660,11 +660,17 @@
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //
 // still do need to distribute it yourself for an application using
 // wxGraphicsContext to be runnable on pre-XP systems.
 //

-// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
-// Windows is known to).
+// Default is 1 except if you're using a non-Microsoft compiler under Windows
+// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
+// mingw32) you may need to install the headers (and just the headers)
+// yourself. If you do, change the setting below manually.

 //
 // Recommended setting: 1
 //
 // Recommended setting: 1

-#define wxUSE_GRAPHICS_CONTEXT 1
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 1
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls

diff --git a/setup.h.in b/setup.h.in
index 9ce60367b4b3d73d0a8abe318f39364cd1a2da0f..0519dabb7def4b1a9ad209a03105ee70e6977f4e 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -323,7 +323,11 @@
 #define wxUSE_STC 0
 
 
 #define wxUSE_STC 0
 
 

-#define wxUSE_GRAPHICS_CONTEXT 0
+#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#else
+    #define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 
 #define wxUSE_CONTROLS     0
 
 
 #define wxUSE_CONTROLS     0