projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compilation fix for wxMSW with wxUSE_MSGBOX_HOOK==0.
[wxWidgets.git]
/
setup.h.in
diff --git
a/setup.h.in
b/setup.h.in
index b975213e2a05681670f8f905774533f27acafec6..f46b3bcca57ae0df0139019f885cc3e2566ed7d8 100644
(file)
--- a/
setup.h.in
+++ b/
setup.h.in
@@
-53,9
+53,6
@@
byte first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
byte first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
-/* Define this if your version of GTK+ is greater than 1.2 */
-#undef __WXGTK12__
-
/* Define this if your version of GTK+ is greater than 1.2.7 */
#undef __WXGTK127__
/* Define this if your version of GTK+ is greater than 1.2.7 */
#undef __WXGTK127__
@@
-71,6
+68,9
@@
/* Define this if your version of GTK+ is greater than 2.18 */
#undef __WXGTK218__
/* Define this if your version of GTK+ is greater than 2.18 */
#undef __WXGTK218__
+/* Define this if your version of GTK+ is >= 3.0 */
+#undef __WXGTK3__
+
/* Define this if you want to use GPE features */
#undef __WXGPE__
/* Define this if you want to use GPE features */
#undef __WXGPE__
@@
-189,8
+189,6
@@
#define wxUSE_EXTENDED_RTTI 0
#define wxUSE_EXTENDED_RTTI 0
-#define wxUSE_STL 0
-
#define wxUSE_LOG 0
#define wxUSE_LOGWINDOW 0
#define wxUSE_LOG 0
#define wxUSE_LOGWINDOW 0
@@
-205,6
+203,13
@@
#define wxUSE_STREAMS 0
#define wxUSE_STREAMS 0
+#define wxUSE_PRINTF_POS_PARAMS 0
+
+#define wxUSE_COMPILER_TLS 0
+
+
+#define wxUSE_STL 0
+
#if defined(__DMC__) || defined(__WATCOMC__) \
|| (defined(_MSC_VER) && _MSC_VER < 1200)
#define wxUSE_STD_DEFAULT 0
#if defined(__DMC__) || defined(__WATCOMC__) \
|| (defined(_MSC_VER) && _MSC_VER < 1200)
#define wxUSE_STD_DEFAULT 0
@@
-212,11
+217,16
@@
#define wxUSE_STD_DEFAULT 0
#endif
#define wxUSE_STD_DEFAULT 0
#endif
+#define wxUSE_STD_CONTAINERS 0
+
#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT
#define wxUSE_STD_STRING wxUSE_STD_DEFAULT
#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT
#define wxUSE_STD_STRING wxUSE_STD_DEFAULT
-#define wxUSE_PRINTF_POS_PARAMS 0
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH 0
+
#define wxUSE_LONGLONG 0
#define wxUSE_LONGLONG 0
@@
-322,6
+332,19
@@
#define wxUSE_STC 0
#define wxUSE_STC 0
+#define wxUSE_WEBVIEW 0
+
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
+
+#if defined(__WXGTK__) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 0
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif
#ifdef _MSC_VER
#ifdef _MSC_VER
@@
-343,14
+366,20
@@
# define wxUSE_GRAPHICS_CONTEXT 0
#endif
# define wxUSE_GRAPHICS_CONTEXT 0
#endif
+#define wxUSE_CAIRO 0
+
+
#define wxUSE_CONTROLS 0
#define wxUSE_CONTROLS 0
+#define wxUSE_MARKUP 0
+
#define wxUSE_POPUPWIN 0
#define wxUSE_TIPWINDOW 0
#define wxUSE_ANIMATIONCTRL 0
#define wxUSE_POPUPWIN 0
#define wxUSE_TIPWINDOW 0
#define wxUSE_ANIMATIONCTRL 0
+#define wxUSE_BANNERWINDOW 0
#define wxUSE_BUTTON 0
#define wxUSE_BMPBUTTON 0
#define wxUSE_CALENDARCTRL 0
#define wxUSE_BUTTON 0
#define wxUSE_BMPBUTTON 0
#define wxUSE_CALENDARCTRL 0
@@
-386,8
+415,10
@@
#define wxUSE_STATTEXT 0
#define wxUSE_STATBMP 0
#define wxUSE_TEXTCTRL 0
#define wxUSE_STATTEXT 0
#define wxUSE_STATBMP 0
#define wxUSE_TEXTCTRL 0
+#define wxUSE_TIMEPICKCTRL 0
#define wxUSE_TOGGLEBTN 0
#define wxUSE_TREECTRL 0
#define wxUSE_TOGGLEBTN 0
#define wxUSE_TREECTRL 0
+#define wxUSE_TREELISTCTRL 0
#define wxUSE_STATUSBAR 0
#define wxUSE_STATUSBAR 0
@@
-423,6
+454,10
@@
#define wxUSE_ACCEL 0
#define wxUSE_ACCEL 0
+#define wxUSE_ARTPROVIDER_STD 0
+
+#define wxUSE_ARTPROVIDER_TANGO 0
+
#define wxUSE_HOTKEY 0
#define wxUSE_CARET 0
#define wxUSE_HOTKEY 0
#define wxUSE_CARET 0
@@
-439,6
+474,10
@@
#define wxUSE_NOTIFICATION_MESSAGE 0
#define wxUSE_NOTIFICATION_MESSAGE 0
+#define wxUSE_PREFERENCES_EDITOR 0
+
+#define wxUSE_RICHTOOLTIP 0
+
#define wxUSE_SASH 0
#define wxUSE_SPLITTER 0
#define wxUSE_SASH 0
#define wxUSE_SPLITTER 0
@@
-551,10
+590,7
@@
#define wxUSE_SVG 0
#define wxUSE_SVG 0
-
-#define REMOVE_UNUSED_ARG 0
-
-#define wxUSE_IOSTREAMH 0
+#define wxUSE_DC_TRANSFORM_MATRIX 0
@@
-651,6
+687,8
@@
#define wxUSE_DATEPICKCTRL_GENERIC 0
#define wxUSE_DATEPICKCTRL_GENERIC 0
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
#define wxUSE_CRASHREPORT 0
/* --- end MSW options --- */
#define wxUSE_CRASHREPORT 0
/* --- end MSW options --- */
@@
-675,6
+713,12
@@
*/
#undef HAVE_VARIADIC_MACROS
*/
#undef HAVE_VARIADIC_MACROS
+/*
+ * Define if you don't want variadic macros to be used even if they are
+ * supported by the compiler.
+ */
+#undef wxNO_VARIADIC_MACROS
+
/*
* Define if your compiler has std::wstring
*/
/*
* Define if your compiler has std::wstring
*/
@@
-787,9
+831,13
@@
*/
#define wxUSE_LIBHILDON2 0
/*
*/
#define wxUSE_LIBHILDON2 0
/*
- * Have glibc2
+ * Use libnotify library.
+ */
+#define wxUSE_LIBNOTIFY 0
+/*
+ * Use libnotify 0.7+ API.
*/
*/
-#define wx
HAVE_GLIBC2
0
+#define wx
USE_LIBNOTIFY_0_7
0
/*
* Use libXpm
*/
/*
* Use libXpm
*/
@@
-978,6
+1026,9
@@
/* Define if you have wcsdup function */
#undef HAVE_WCSDUP
/* Define if you have wcsdup function */
#undef HAVE_WCSDUP
+/* Define if you have wcsftime() function */
+#undef HAVE_WCSFTIME
+
/* Define if you have strnlen() function */
#undef HAVE_STRNLEN
/* Define if you have strnlen() function */
#undef HAVE_STRNLEN
@@
-1086,6
+1137,9
@@
/* Define if you have thr_setconcurrency function */
#undef HAVE_THR_SETCONCURRENCY
/* Define if you have thr_setconcurrency function */
#undef HAVE_THR_SETCONCURRENCY
+/* Define if you have pthread_setconcurrency function */
+#undef HAVE_PTHREAD_SET_CONCURRENCY
+
/* Define if you have the uname function. */
#undef HAVE_UNAME
/* Define if you have the uname function. */
#undef HAVE_UNAME
@@
-1140,12
+1194,6
@@
/* Define this if you have fputws() */
#undef HAVE_FPUTWS
/* Define this if you have fputws() */
#undef HAVE_FPUTWS
-/* Define this if you have strcasecmp() function in <string.h> */
-#undef HAVE_STRCASECMP_IN_STRING_H
-
-/* Define this if you have strcasecmp() function in <strings.h> */
-#undef HAVE_STRCASECMP_IN_STRINGS_H
-
/* Define this if you have wprintf() and related functions */
#undef HAVE_WPRINTF
/* Define this if you have wprintf() and related functions */
#undef HAVE_WPRINTF
@@
-1179,6
+1227,9
@@
/* Define if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
/* Define if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
+/* Define if you have abi::__forced_unwind in your <cxxabi.h>. */
+#undef HAVE_ABI_FORCEDUNWIND
+
/* Define if fdopen is available. */
#undef HAVE_FDOPEN
/* Define if fdopen is available. */
#undef HAVE_FDOPEN
@@
-1191,6
+1242,9
@@
/* Define if getgrgid_r is available. */
#undef HAVE_GETGRGID_R
/* Define if getgrgid_r is available. */
#undef HAVE_GETGRGID_R
+/* Define if setpriority() is available. */
+#undef HAVE_SETPRIORITY
+
/* Define if locale_t is available */
#undef HAVE_LOCALE_T
/* Define if locale_t is available */
#undef HAVE_LOCALE_T
@@
-1206,10
+1260,6
@@
#ifdef __WIN32__
#ifdef __WIN32__
-/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
- with wx/msw/setup.h */
-#define wxUSE_XPM_IN_MSW wxUSE_XPM
-
/* When using an external jpeg library and the Windows headers already define
* boolean, define to the type used by the jpeg library for boolean. */
#undef wxHACK_BOOLEAN
/* When using an external jpeg library and the Windows headers already define
* boolean, define to the type used by the jpeg library for boolean. */
#undef wxHACK_BOOLEAN