don't force wxUSE_EXTENDED_RTTI to eb 1 for Borland compiler (why?)

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 460b31b7b01e457c086003ec46991be2a66e6f5b..7fc59ff30d5a34af0ff0ff13efd28be2fa3bb29c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -319,7 +319,11 @@
 
 #define wxUSE_STATUSBAR    1
 
 
 #define wxUSE_STATUSBAR    1
 

+#if defined(__WXMSW__) || defined(__WXMAC__)

 #define wxUSE_NATIVE_STATUSBAR        1
 #define wxUSE_NATIVE_STATUSBAR        1

+#else
+#define wxUSE_NATIVE_STATUSBAR        0
+#endif

 
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
 
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1


@@ -334,6 +338,8 @@
 
 #define wxUSE_GRID         1
 
 
 #define wxUSE_GRID         1
 

+#define wxUSE_MINIFRAME 1
+

 
 #define wxUSE_ACCEL 1
 
 
 #define wxUSE_ACCEL 1
 


@@ -486,17 +492,12 @@
 
 /* --- end common options --- */
 
 
 /* --- end common options --- */
 

-/* enable native status bar under Win32 */
-#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
-#define wxUSE_NATIVE_STATUSBAR 1
-#define wxUSE_OWNER_DRAWN 1
-#endif
-
-#if defined(__WXPM__)
+/* for some features we don't have dedicated configure switches, so just choose
+ * the common values automatically */
+#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)

 #define wxUSE_OWNER_DRAWN 1
 #endif
 
 #define wxUSE_OWNER_DRAWN 1
 #endif
 

-/* enable rich edit under Win32 */

 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #else
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #else


@@ -569,10 +570,6 @@
  * case WX_NO_REGEX_ADVANCED should be defined.
  */
 #undef WX_NO_REGEX_ADVANCED
  * case WX_NO_REGEX_ADVANCED should be defined.
  */
 #undef WX_NO_REGEX_ADVANCED

-/*
- * Use XML support
- */
-#define wxUSE_XML 0

 /*
  * Use SDL for audio (Unix)
  */
 /*
  * Use SDL for audio (Unix)
  */


@@ -598,10 +595,8 @@
  */
 #define wxHAVE_LIB_XPM 0
 /*
  */
 #define wxHAVE_LIB_XPM 0
 /*

- * Use font metric files in GetTextExtent for wxPostScriptDC

  * Use consistent PostScript fonts for AFM and printing (!)
  */
  * Use consistent PostScript fonts for AFM and printing (!)
  */

-#define wxUSE_AFM_FOR_POSTSCRIPT 0

 #define wxUSE_NORMALIZED_PS_FONTS 0
 
 /* compatibility */
 #define wxUSE_NORMALIZED_PS_FONTS 0
 
 /* compatibility */