support retina display

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index b1c741e43d02b2710b04b04adc9e07bb3a1d895a..ad5744acaf1f518f408a0ade9733ea7709c89ef0 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -92,6 +92,14 @@
 #   endif
 #endif /* wxUSE_ANY */
 
 #   endif
 #endif /* wxUSE_ANY */
 

+#ifndef wxUSE_COMPILER_TLS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COMPILER_TLS must be defined, please read comment near the top of this file."
+#   else
+#       define wxUSE_COMPILER_TLS 0
+#   endif
+#endif /* !defined(wxUSE_COMPILER_TLS) */
+

 #ifndef wxUSE_CONSOLE_EVENTLOOP
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file."
 #ifndef wxUSE_CONSOLE_EVENTLOOP
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file."


@@ -1203,8 +1211,11 @@
 
 #if defined(__WXWINCE__)
 #  include "wx/msw/wince/chkconf.h"
 
 #if defined(__WXWINCE__)
 #  include "wx/msw/wince/chkconf.h"

-#elif defined(__WXMSW__)
+#elif defined(__WINDOWS__)

 #  include "wx/msw/chkconf.h"
 #  include "wx/msw/chkconf.h"

+#  if defined(__WXGTK__)
+#      include "wx/gtk/chkconf.h"
+#  endif

 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #elif defined(__WXCOCOA__)


@@ -1225,9 +1236,9 @@
 
 /*
     __UNIX__ is also defined under Cygwin but we shouldn't perform these checks
 
 /*
     __UNIX__ is also defined under Cygwin but we shouldn't perform these checks

-    there if we're building wxMSW.
+    there if we're building Windows ports.

  */
  */

-#if defined(__UNIX__) && !defined(__WXMSW__)
+#if defined(__UNIX__) && !defined(__WINDOWS__)

 #   include "wx/unix/chkconf.h"
 #endif
 
 #   include "wx/unix/chkconf.h"
 #endif