projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use std menu ids for stock items
[wxWidgets.git]
/
setup.h.in
diff --git
a/setup.h.in
b/setup.h.in
index bc60915bcb3a93794d7aab0247462e4791442ee4..e718230c58e10d650a3e8e1e6f2e26ecf52324b5 100644
(file)
--- a/
setup.h.in
+++ b/
setup.h.in
@@
-203,7
+203,12
@@
#define wxUSE_STD_IOSTREAM 0
#define wxUSE_STD_IOSTREAM 0
-#define wxUSE_STD_STRING 0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+ || (defined(_MSC_VER) && _MSC_VER < 1200)
+ #define wxUSE_STD_STRING 0
+#else
+ #define wxUSE_STD_STRING 0
+#endif
#define wxUSE_PRINTF_POS_PARAMS 0
#define wxUSE_PRINTF_POS_PARAMS 0
@@
-245,12
+250,16
@@
#define wxUSE_FS_ZIP 0
#define wxUSE_FS_ZIP 0
+#define wxUSE_FS_ARCHIVE 0
+
#define wxUSE_FS_INET 0
#define wxUSE_ARCHIVE_STREAMS 0
#define wxUSE_ZIPSTREAM 0
#define wxUSE_FS_INET 0
#define wxUSE_ARCHIVE_STREAMS 0
#define wxUSE_ZIPSTREAM 0
+#define wxUSE_TARSTREAM 0
+
#define wxUSE_ZLIB 0
#define wxUSE_APPLE_IEEE 0
#define wxUSE_ZLIB 0
#define wxUSE_APPLE_IEEE 0
@@
-285,27
+294,30
@@
#define wxUSE_XRC 0
#define wxUSE_XRC 0
-#if wxUSE_XRC
-#define wxUSE_XML 0
-#else
-# define wxUSE_XML 0
-#endif
+#define wxUSE_XML wxUSE_XRC
#define wxUSE_AUI 0
#define wxUSE_AUI 0
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+
#define wxUSE_CONTROLS 0
#define wxUSE_POPUPWIN 0
#define wxUSE_TIPWINDOW 0
#define wxUSE_CONTROLS 0
#define wxUSE_POPUPWIN 0
#define wxUSE_TIPWINDOW 0
+#define wxUSE_ANIMATIONCTRL 0
#define wxUSE_BUTTON 0
#define wxUSE_BMPBUTTON 0
#define wxUSE_CALENDARCTRL 0
#define wxUSE_CHECKBOX 0
#define wxUSE_CHECKLISTBOX 0
#define wxUSE_CHOICE 0
#define wxUSE_BUTTON 0
#define wxUSE_BMPBUTTON 0
#define wxUSE_CALENDARCTRL 0
#define wxUSE_CHECKBOX 0
#define wxUSE_CHECKLISTBOX 0
#define wxUSE_CHOICE 0
+#define wxUSE_COLLPANE 0
#define wxUSE_COLOURPICKERCTRL 0
#define wxUSE_COMBOBOX 0
#define wxUSE_DATAVIEWCTRL 0
#define wxUSE_COLOURPICKERCTRL 0
#define wxUSE_COMBOBOX 0
#define wxUSE_DATAVIEWCTRL 0
@@
-415,6
+427,8
@@
#define wxUSE_WIZARDDLG 0
#define wxUSE_WIZARDDLG 0
+#define wxUSE_ABOUTDLG 0
+
#define wxUSE_METAFILE 0
#define wxUSE_ENH_METAFILE 0
#define wxUSE_METAFILE 0
#define wxUSE_ENH_METAFILE 0
@@
-454,6
+468,9
@@
#define wxUSE_HELP 0
#define wxUSE_HELP 0
+#define wxUSE_MS_HTML_HELP 0
+
+
#define wxUSE_WXHTML_HELP 0
#define wxUSE_RESOURCES 0
#define wxUSE_WXHTML_HELP 0
#define wxUSE_RESOURCES 0
@@
-494,6
+511,8
@@
#define wxUSE_LIBTIFF 0
#define wxUSE_LIBTIFF 0
+#define wxUSE_TGA 0
+
#define wxUSE_GIF 0
#define wxUSE_PNM 0
#define wxUSE_GIF 0
#define wxUSE_PNM 0
@@
-508,6
+527,15
@@
#define wxUSE_PALETTE 0
#define wxUSE_PALETTE 0
+
+#define wxUSE_ALL_THEMES 0
+
+#define wxUSE_THEME_GTK 0
+#define wxUSE_THEME_METAL 0
+#define wxUSE_THEME_MONO 0
+#define wxUSE_THEME_WIN32 0
+
+
/* --- end common options --- */
/* for some features we don't have dedicated configure switches, so just choose
/* --- end common options --- */
/* for some features we don't have dedicated configure switches, so just choose
@@
-697,9
+725,11
@@
*/
#define wxUSE_X_RESOURCES 0
/*
*/
#define wxUSE_X_RESOURCES 0
/*
- * Use OLE (MSW only)
+ * Use OLE
and OLE Automation
(MSW only)
*/
#define wxUSE_OLE 0
*/
#define wxUSE_OLE 0
+#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0
/* for compatibility */
#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
/* for compatibility */
#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
@@
-730,6
+760,12
@@
*/
#define CONST_COMPATIBILITY 0
*/
#define CONST_COMPATIBILITY 0
+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM 0
+
+
/* define with the name of timezone variable */
#undef WX_TIMEZONE
/* define with the name of timezone variable */
#undef WX_TIMEZONE
@@
-838,6
+874,9
@@
/* Define if strptime() is declared in headers */
#undef HAVE_STRPTIME_DECL
/* Define if strptime() is declared in headers */
#undef HAVE_STRPTIME_DECL
+/* Define if you have strtoull() and strtoll() */
+#undef HAVE_STRTOULL
+
/* Define if you have all functions to set thread priority */
#undef HAVE_THREAD_PRIORITY_FUNCTIONS
/* Define if you have all functions to set thread priority */
#undef HAVE_THREAD_PRIORITY_FUNCTIONS
@@
-860,6
+899,9
@@
/* Define if you have wcslen function */
#undef HAVE_WCSLEN
/* Define if you have wcslen function */
#undef HAVE_WCSLEN
+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+
/* define if you have vsscanf function */
#undef HAVE_VSSCANF
/* define if you have vsscanf function */
#undef HAVE_VSSCANF
@@
-1016,6
+1058,9
@@
/* Define if you have the <wctype.h> header file. */
#undef HAVE_WCTYPE_H
/* Define if you have the <wctype.h> header file. */
#undef HAVE_WCTYPE_H
+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H
+
/* Define if you have the <iconv.h> header file and iconv() symbol. */
#undef HAVE_ICONV
/* Define if you have the <iconv.h> header file and iconv() symbol. */
#undef HAVE_ICONV
@@
-1098,6
+1143,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 fdopen is available. */
+#undef HAVE_FDOPEN
+
/* -------------------------------------------------------------------------
Win32 adjustments section
------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------
Win32 adjustments section
------------------------------------------------------------------------- */
@@
-1138,6
+1186,5
@@
/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
#undef wxHAS_WORKING_GTK_DC_BLIT
/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
#undef wxHAS_WORKING_GTK_DC_BLIT
-
#endif /* __WX_SETUP_H__ */
#endif /* __WX_SETUP_H__ */