X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5cdff2990b454157e576cabe36824669b72e7933..85b657c79d32e5876ce5b8ae1e7b9519fee18247:/include/wx/univ/setup0.h

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index ca3e8df6d7..5d5d864f70 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -6,7 +6,7 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_SETUP_H_
@@ -62,19 +62,6 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
-// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
-// but this is very dangerous because you can mistakenly pass an icon instead
-// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
-// because an icon is not a valid bitmap
-//
-// Starting from 2.1.12, you have the choice under this backwards compatible
-// behaviour (your code will still compile, but probably won't behave as
-// expected!) and not deriving wxIcon class from wxBitmap, but providing a
-// conversion ctor wxBitmap(const wxIcon&) instead.
-//
-// Recommended setting: 0
-#define wxICON_IS_BITMAP 0
-
 // Define as 1 for font size to be backward compatible to 1.63 and earlier.
 // 1.64 and later define point sizes to be compatible with Windows.
 //
@@ -227,13 +214,6 @@
 // Recommended setting: 1 (always)
 #define wxUSE_LOG 1
 
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
 // Recommended setting: 1
 #define wxUSE_LOGWINDOW 1
 
@@ -243,6 +223,13 @@
 // Recommended setting: 1
 #define wxUSE_LOG_DIALOG 1
 
+// Support for command line parsing using wxCmdLineParser class.
+//
+// Default is 1
+//
+// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
+#define wxUSE_CMDLINE_PARSER 1
+
 // Support for multithreaded applications: if 1, compile in thread classes
 // (thread.h) and make the library a bit more thread safe. Although thread
 // support is quite stable by now, you may still consider recompiling the
@@ -460,14 +447,14 @@
 // Recommended setting: 1
 #define wxUSE_PROTOCOL 1
 
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
 // The settings for the individual URL schemes
 #define wxUSE_PROTOCOL_FILE 1
 #define wxUSE_PROTOCOL_FTP 1
 #define wxUSE_PROTOCOL_HTTP 1
 
+// Define this to use wxURL class.
+#define wxUSE_URL 1
+
 // Support for regular expression matching via wxRegEx class: enable this to
 // use POSIX regular expressions in your code. You need to compile regex
 // library from src/regex to use it under Windows.
@@ -630,6 +617,14 @@
 // Recommended setting: 1 (can be safely set to 0, not used by the library)
 #define wxUSE_CARET 1
 
+// Use wxDisplay class: it allows enumerating all displays on a system and
+// working with them.
+//
+// Default is 0 because it isn't yet implemented on all platforms
+//
+// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
+#define wxUSE_DISPLAY       0
+
 // Miscellaneous geometry code: needed for Canvas library
 #define wxUSE_GEOMETRY 0
 
@@ -680,6 +675,10 @@
 // wxDC cacheing implementation
 #define wxUSE_DC_CACHEING 1
 
+// Set this to 1 to enable the use of DIB's for wxBitmap to support
+// bitmaps > 16MB on Win95/98/Me.  Set to 0 to use DDB's only.
+#define wxUSE_DIB_FOR_BITMAP 0
+
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------
@@ -824,7 +823,15 @@
 // smaller library.
 #define wxUSE_HTML 1
 
-// OpenGL canvas
+// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
+// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
+// set to 1. Note that for some compilers (notably Microsoft Visual C++) you
+// will need to manually add opengl32.lib and glu32.lib to the list of
+// libraries linked with your program if you use OpenGL.
+//
+// Default is 0.
+//
+// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
 #if defined(__WIN32__)
     #define wxUSE_GLCANVAS 1
 #else
@@ -866,6 +873,14 @@
     #define wxUSE_DRAG_AND_DROP 0
 #endif
 
+// Use wxAccessible for enhanced and customisable accessibility.
+// Depends on wxUSE_OLE.
+//
+// Default is 0.
+//
+// Recommended setting (at present): 0
+#define wxUSE_ACCESSIBILITY 0
+
 // ----------------------------------------------------------------------------
 // miscellaneous settings
 // ----------------------------------------------------------------------------
@@ -1044,11 +1059,7 @@
 #define wxUSE_ICO_CUR 0
 
 // Set to 1 to compile in wxPalette class
-#if defined(__WIN32__)
-    #define wxUSE_PALETTE 1
-#else
-    #define wxUSE_PALETTE 1
-#endif
+ #define wxUSE_PALETTE 1
 
 // ----------------------------------------------------------------------------
 // Windows-only settings
@@ -1101,7 +1112,7 @@
 //
 // Recommended setting: 1, only set it to 0 if your compiler doesn't have
 //                      or can't compile <richedit.h>
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 // TODO:  This should be ifdef'ed for any compilers that don't support
 //        RichEdit 2.0 but do have RichEdit 1.0...
     #define wxUSE_RICHEDIT 0 // currently not supported
@@ -1201,14 +1212,6 @@
     #define wxUSE_OWNER_DRAWN 0
 #endif // __SALFORDC__
 
-#ifdef __TWIN32__
-    #undef wxUSE_THREADS
-    #define wxUSE_THREADS 0
-
-    #undef wxUSE_ODBC
-    #define wxUSE_ODBC 0
-#endif // __TWIN32__
-
 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
     #undef wxUSE_WX_RESOURCES
@@ -1292,23 +1295,10 @@
 // unknown settings
 // ----------------------------------------------------------------------------
 
-// Use serialization (requires utils/serialize)?
-#define wxUSE_SERIAL 0
-
-// Use plotter?
-#define wxUSE_PLOT 0
-
 // If 1, enables provision of run-time type information.
 // NOW MANDATORY: don't change.
 #define wxUSE_DYNAMIC_CLASSES 1
 
-//??????
-#if defined(__WIN32__)
-    #define wxUSE_DISPLAY 0
-#else
-    #define wxUSE_DISPLAY 0
-#endif
-
 //??????
 #if defined(__WIN32__)
     #define wxUSE_DDE_FOR_IPC 0