compilation fix for wxUSE_STL==1 build

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

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 83843b71e3d9a31d558c59b5034f2aafe96b9877..2a69ec8bb377c1402b287bc1fe44778d4a7fc040 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).
 //
 // 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
 #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
 #endif
 
 // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode


@@ -361,15 +361,6 @@
 // Recommended setting: 1
 #define wxUSE_DATETIME 1
 
 // Recommended setting: 1
 #define wxUSE_DATETIME 1
 

-// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not
-// the same as wxDateTime!). These classes are obsolete and shouldn't be used
-// in new code
-//
-// Default is 0
-//
-// Recommended setting: 0 unless you have legacy code which uses these classes
-#define wxUSE_TIMEDATE 0
-

 // Set wxUSE_TIMER to 1 to compile wxTimer class
 //
 // Default is 1
 // Set wxUSE_TIMER to 1 to compile wxTimer class
 //
 // Default is 1


@@ -543,20 +534,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 

-// Use QuickTime
-//
-// Default is 0
-//
-// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
-#define wxUSE_QUICKTIME     0
-
-// Use DirectShow
-//
-// Default is 0
-//
-// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
-#define wxUSE_DIRECTSHOW    0
-

 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1


@@ -583,6 +560,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)


@@ -601,10 +585,6 @@
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           0
 
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           0
 

-// Set to 1 to auto-adapt to MS Windows XP themes where possible
-// (notably, wxNotebook pages)
-#define wxUSE_UXTHEME_AUTO      0
-

 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------


@@ -762,9 +742,6 @@
 //
 #define wxUSE_GRID 1
 
 //
 #define wxUSE_GRID 1
 

-// wxProperty[Value/Form/List] classes, used by Dialog Editor
-#define wxUSE_PROPSHEET 1
-

 // wxComboCtrl and related classes: combobox with custom popup window and
 // not necessarily a listbox.
 //
 // wxComboCtrl and related classes: combobox with custom popup window and
 // not necessarily a listbox.
 //


@@ -1040,9 +1017,6 @@
 // smaller library.
 #define wxUSE_RICHTEXT       1
 
 // smaller library.
 #define wxUSE_RICHTEXT       1
 

-// wxTreeLayout class
-#define wxUSE_TREELAYOUT 1
-

 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------


@@ -1119,9 +1093,6 @@
 // Use wxHTML-based help controller
 #define wxUSE_WXHTML_HELP 1
 
 // Use wxHTML-based help controller
 #define wxUSE_WXHTML_HELP 1
 

-// Use resources
-#define wxUSE_RESOURCES 0
-

 // Window layout constraint system
 #define wxUSE_CONSTRAINTS 1
 
 // Window layout constraint system
 #define wxUSE_CONSTRAINTS 1
 


@@ -1303,10 +1274,6 @@
 // unknown settings
 // ----------------------------------------------------------------------------
 
 // unknown settings
 // ----------------------------------------------------------------------------
 

-// If 1, enables provision of run-time type information.
-// NOW MANDATORY: don't change.
-#define wxUSE_DYNAMIC_CLASSES 1
-

 //??????
 #if defined(__WIN32__)
     #define wxUSE_DDE_FOR_IPC 0
 //??????
 #if defined(__WIN32__)
     #define wxUSE_DDE_FOR_IPC 0