test complete :-)

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index d853492a2b89ffcdbf885a5a0d0f4346a7e04326..1a73808f9e2645272d23d085c3fe8dae91a76290 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -19,6 +19,10 @@
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 
+// ----------------------------------------------------------------------------
+// compatibility settings
+// ----------------------------------------------------------------------------
+
 #define WXWIN_COMPATIBILITY  0
                                 // Compatibility with 1.68 API.
                                 // Level 0: no backward compatibility, all new features
@@ -26,13 +30,27 @@
                                 // the compatibility code is now very minimal so there
                                 // is little advantage to setting it to 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
+
 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
-
+#define wxUSE_DIALUP_MANAGER   1
+                                // Use wxDialUpManager class
 #define wxUSE_POSTSCRIPT  0
                                 // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
@@ -61,8 +79,6 @@
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
-#define wxUSE_TOOLBAR      1
-                                // Define 1 to use toolbar classes
 #define wxUSE_BUTTONBAR    1
                                 // Define 1 to use buttonbar classes (enhanced toolbar
                                 // for MS Windows)
@@ -173,6 +189,14 @@
 #define wxUSE_ODBC          0
                                 // Define 1 to use ODBC classes
 
+#define wxODBC_FWD_ONLY_CURSORS 1
+                                // Some databases/ODBC drivers only allow forward scrolling cursors.
+                                // Unless you specifically want to use backward scrolling
+                                // cursors, and you know that all of the databases/ODBC drivers
+                                // that you will use these odbc classes with allow backward 
+                                // scrolling cursors, this setting should remain set to 1
+                                // for maximum database/driver compatibilty
+
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 #else
@@ -219,16 +243,16 @@
                                 // wxWindow::SetToolTip() method
 #define wxUSE_SOCKETS       1
                                 // Set to 1 to use socket classes
-#define wxUSE_HTML          0
+#define wxUSE_HTML          1
                                 // Set to 1 to use wxHTML sub-library
-#define wxUSE_FS_ZIP        0
-#define wxUSE_FS_INET       0   // Set to 1 to enable virtual file systems
+#define wxUSE_FS_ZIP        1
+#define wxUSE_FS_INET       1   // Set to 1 to enable virtual file systems
 
-#define wxUSE_BUSYINFO      0
+#define wxUSE_BUSYINFO      1
                                 // wxBusyInfo displays window with message
                                 // when app is busy. Works in same way as
                                 // wxBusyCursor
-#define wxUSE_ZIPSTREAM     0
+#define wxUSE_ZIPSTREAM     1
                                 // input stream for reading from zip archives
 
 /*
@@ -293,6 +317,13 @@
                                 // See note above about using FAFA and CTL3D.
 #endif
 
+// can we use RICHEDIT control?
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0
+#endif
+
 #define wxUSE_COMMON_DIALOGS         1
                                 // On rare occasions (e.g. using DJGPP) may want
                                 // to omit common dialogs
@@ -323,9 +354,6 @@
 
 #define wxUSE_NATIVE_STATUSBAR        1
                                 // Set to 0 to use cross-platform wxStatusBar
-#define wxUSE_DBWIN32                 1
-                                // Use Andrew Tucker's OutputDebugString implementation
-                                // (required on Win95 only). See utils.cpp.
 
 /*
  * Any platform
@@ -373,9 +401,6 @@
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
-#undef wxUSE_DBWIN32
-#define wxUSE_DBWIN32 0
-
 #undef wxUSE_OWNER_DRAWN
 #define wxUSE_OWNER_DRAWN 0
 #endif
@@ -385,23 +410,18 @@
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
-#undef wxUSE_DBWIN32
-#define wxUSE_DBWIN32 0
-
 #undef wxUSE_ODBC
 #define wxUSE_ODBC 0
 
 #endif
 
-#if defined(__WXMSW__) && defined(__BORLANDC__)
-#undef wxUSE_ODBC
-#define wxUSE_ODBC 0
-#endif
-
 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
 #undef wxUSE_WX_RESOURCES
 #define wxUSE_WX_RESOURCES        0
+
+#undef wxUSE_ODBC
+#define wxUSE_ODBC                0
 #endif
 
 #if defined(__WXMSW__) && defined(__WATCOMC__)