Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / gtk / chkconf.h

diff --git a/include/wx/gtk/chkconf.h b/include/wx/gtk/chkconf.h
index 6715f824da5b326b832199137cd13670425a5b16..84595b256cb4431281d00444d2e49d6c7d3f15b3 100644 (file)
--- a/include/wx/gtk/chkconf.h
+++ b/include/wx/gtk/chkconf.h
@@ -3,7 +3,6 @@
  * Purpose:     wxGTK-specific settings consistency checks
  * Author:      Vadim Zeitlin
  * Created:     2007-07-19 (extracted from wx/chkconf.h)
- * RCS-ID:      $Id$
  * Copyright:   (c) 2000-2007 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -45,6 +44,11 @@
 #   define wxUSE_METAFILE 0
 #endif
 
+#if wxUSE_ENH_METAFILE
+#   undef  wxUSE_ENH_METAFILE
+#   define wxUSE_ENH_METAFILE 0
+#endif
+
 #ifndef __UNIX__
 
 #   undef  wxUSE_WEBVIEW
@@ -55,9 +59,11 @@
 #   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.
+    /*
+        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
@@ -67,8 +73,10 @@
 
 #endif /* __UNIX__ */
 
-// We always need Cairo with wxGTK, enable it if necessary (this can only
-// happen under Windows).
+/*
+    We always need Cairo with wxGTK, enable it if necessary (this can only
+    happen under Windows).
+ */
 #ifdef __WINDOWS__
 
 #if !wxUSE_CAIRO
@@ -77,3 +85,14 @@
 #endif
 
 #endif  /* __WINDOWS__ */
+
+#ifdef __WXGTK3__
+    #if !wxUSE_GRAPHICS_CONTEXT
+        #ifdef wxABORT_ON_CONFIG_ERROR
+            #error "GTK+ 3 support requires wxGraphicsContext"
+        #else
+            #undef wxUSE_GRAPHICS_CONTEXT
+            #define wxUSE_GRAPHICS_CONTEXT 1
+        #endif
+    #endif
+#endif