add wxUSE_BASE64 checks around DoRead/WriteBinary() functions

[wxWidgets.git] / include / wx / univ / setup0.h

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 83843b71e3d9a31d558c59b5034f2aafe96b9877..228efff55305fb217d744a217e48cba3b60848c4 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -142,11 +142,11 @@
 // doesn't support it and the programs compiled in Unicode mode will not run
 // under 9x).
 //
-// Default is 0
+// Default is 1
 //
-// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
+// Recommended setting: 1
 #ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 0
+    #define wxUSE_UNICODE 1
 #endif
 
 // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
@@ -583,6 +583,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
+// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_STC 1
+
 
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
@@ -1119,9 +1126,6 @@
 // Use wxHTML-based help controller
 #define wxUSE_WXHTML_HELP 1
 
-// Use resources
-#define wxUSE_RESOURCES 0
-
 // Window layout constraint system
 #define wxUSE_CONSTRAINTS 1