Avoid do-nothing virtuals in WinCE.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 3195952c7855283909aaf88e33c47147c49d830f..b9ba86f943e3440c78612e9d3b8d7e4524ca2f62 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -125,9 +125,6 @@
 #undef __WINDOWS__
 #endif
 
-#ifndef __WIN95__
-#undef __WIN95__
-#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
@@ -203,7 +200,12 @@
 
 #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
 
@@ -245,12 +247,16 @@
 
 #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_TARSTREAM     0
+
 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
@@ -285,27 +291,30 @@
 
 #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
 
 
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+
 #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_COLLPANE      0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
 #define wxUSE_DATAVIEWCTRL  0
@@ -320,6 +329,7 @@
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
 #define wxUSE_SCROLLBAR     0
+#define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
 #define wxUSE_SPINBTN       0
 #define wxUSE_SPINCTRL      0
@@ -415,6 +425,8 @@
 
 #define wxUSE_WIZARDDLG 0
 
+#define wxUSE_ABOUTDLG 0
+
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -454,6 +466,9 @@
 #define wxUSE_HELP        0
 
 
+#define wxUSE_MS_HTML_HELP 0
+
+
 #define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_RESOURCES   0
@@ -494,6 +509,8 @@
 
 #define wxUSE_LIBTIFF       0
 
+#define wxUSE_TGA           0
+
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
@@ -521,13 +538,13 @@
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else
@@ -741,6 +758,12 @@
  */
 #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
 
@@ -849,6 +872,9 @@
 /* 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
 
@@ -871,6 +897,9 @@
 /* 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
 
@@ -1027,6 +1056,9 @@
 /* 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
 
@@ -1109,6 +1141,9 @@
 /* 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
    ------------------------------------------------------------------------- */
@@ -1124,9 +1159,9 @@
  */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
-/* Define if the system headers declare the type boolean (which will conflict
- * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
-#undef HAVE_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
 
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H