From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Jun 2012 21:35:01 +0000 (+0000)
Subject: Disable options that don't work with wxGTK in wx/chkconf.h.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/54f59b007e3883bc97842eff008c54e27c3f8243

Disable options that don't work with wxGTK in wx/chkconf.h.

When building wxGTK under Windows, some MSW-specific options can be defined
but can't be implemented when using GTK, forcefully disable them.

Also a few others that could be implemented but that don't work currently.

Finally, forcefully enable Cairo support as wxGTK always needs it.

Closes #14412.

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

diff --git a/include/wx/gtk/chkconf.h b/include/wx/gtk/chkconf.h
index 1f83d484ed..6715f824da 100644
--- a/include/wx/gtk/chkconf.h
+++ b/include/wx/gtk/chkconf.h
@@ -29,3 +29,51 @@
 #        endif
 #    endif
 #endif /* wxUSE_JOYSTICK */
+
+#if wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
+#   undef  wxUSE_POSTSCRIPT
+#   define wxUSE_POSTSCRIPT 1
+#endif
+
+#if wxUSE_OWNER_DRAWN
+#   undef  wxUSE_OWNER_DRAWN
+#   define wxUSE_OWNER_DRAWN 0
+#endif
+
+#if wxUSE_METAFILE
+#   undef  wxUSE_METAFILE
+#   define wxUSE_METAFILE 0
+#endif
+
+#ifndef __UNIX__
+
+#   undef  wxUSE_WEBVIEW
+#   define wxUSE_WEBVIEW 0
+#   undef  wxUSE_WEBVIEW_WEBKIT
+#   define wxUSE_WEBVIEW_WEBKIT 0
+
+#   undef  wxUSE_MEDIACTRL
+#   define wxUSE_MEDIACTRL 0
+
+    // We could use GDK_WINDOWING_X11 for those but this would require
+    // including gdk/gdk.h and we don't want to do it from here, so assume
+    // we're not using X11 if we're not under Unix.
+
+#   undef  wxUSE_UIACTIONSIMULATOR
+#   define wxUSE_UIACTIONSIMULATOR 0
+
+#   undef  wxUSE_GLCANVAS
+#   define wxUSE_GLCANVAS 0
+
+#endif /* __UNIX__ */
+
+// We always need Cairo with wxGTK, enable it if necessary (this can only
+// happen under Windows).
+#ifdef __WINDOWS__
+
+#if !wxUSE_CAIRO
+#   undef  wxUSE_CAIRO
+#   define wxUSE_CAIRO 1
+#endif
+
+#endif  /* __WINDOWS__ */