Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index 2561a19e1bc6441bc5e73ae6a647a379a1d4b125..b5bfb413b0e055a2abb75c821a01dd0f1592f4a4 100644 (file)
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -267,6 +267,17 @@
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 

+// Enable the use of compiler-specific thread local storage keyword, if any.
+// This is used for wxTLS_XXX() macros implementation and normally should use
+// the compiler-provided support as it's simpler and more efficient, but must
+// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
+// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
+// support that results in crashes when any TLS variables are used. So if you
+// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
+// this to 0.
+//
+// Default is 1, but set to 0 if the scenario above is applicable.
+#define wxUSE_COMPILER_TLS 1

 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.
 
 // ----------------------------------------------------------------------------
 // Interoperability with the standard library.


@@ -1634,4 +1645,12 @@
 #define wxUSE_CRASHREPORT 1
 /* --- end MSW options --- */
 
 #define wxUSE_CRASHREPORT 1
 /* --- end MSW options --- */
 

+// GTK-specific options used when not using configure. As we can't test for the
+// exact GTK version (without including GTK+ headers that we don't want to
+// include from our own public headers), just assume a recent GTK 2.x.
+#define __WXGTK20__
+#define __WXGTK210__
+#define __WXGTK218__
+//#define __WXGTK3__
+

 #endif // _WX_SETUP_H_
 #endif // _WX_SETUP_H_