No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/chkconf.h b/include/wx/gtk/chkconf.h
index afd727fa3f9e631c72024914736a97a978bcc05e..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
@@ -81,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