projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebake all project files to reflect MSVC deprecation warnings defines.
[wxWidgets.git]
/
setup.h.in
diff --git
a/setup.h.in
b/setup.h.in
index 99f4fd8a5350e9e59de9a40a2f44404b958a6a85..97fcb89a6a7d0d86076bf89e0aff890d29e24381 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__
@@
-216,7
+213,7
@@
#define wxUSE_STD_DEFAULT 0
#endif
#define wxUSE_STD_DEFAULT 0
#endif
-#define wxUSE_STD_CONTAINERS
wxUSE_STD_DEFAULT
+#define wxUSE_STD_CONTAINERS
0
#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT
#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT
@@
-224,6
+221,8
@@
#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+#define wxUSE_IOSTREAMH 0
+
#define wxUSE_LONGLONG 0
#define wxUSE_LONGLONG 0
@@
-329,6
+328,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
@@
-363,6
+375,7
@@
#define wxUSE_TIPWINDOW 0
#define wxUSE_ANIMATIONCTRL 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
@@
-398,8
+411,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
@@
-455,6
+470,8
@@
#define wxUSE_NOTIFICATION_MESSAGE 0
#define wxUSE_NOTIFICATION_MESSAGE 0
+#define wxUSE_RICHTOOLTIP 0
+
#define wxUSE_SASH 0
#define wxUSE_SPLITTER 0
#define wxUSE_SASH 0
#define wxUSE_SPLITTER 0
@@
-567,10
+584,7
@@
#define wxUSE_SVG 0
#define wxUSE_SVG 0
-
-#define REMOVE_UNUSED_ARG 0
-
-#define wxUSE_IOSTREAMH 0
+#define wxUSE_DC_TRANSFORM_MATRIX 0
@@
-667,6
+681,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 --- */
@@
-802,10
+818,6
@@
* Use the Hildon 2.0 framework
*/
#define wxUSE_LIBHILDON2 0
* Use the Hildon 2.0 framework
*/
#define wxUSE_LIBHILDON2 0
-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0
/*
* Use libXpm
*/
/*
* Use libXpm
*/