merge of wxMac into main repository

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 1f3016ea9f0959e4063d250566790b935c4938a6..c3af84e11c2eb6c267b1d50ffdce84a685700a64 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -26,6 +26,8 @@
 // General features
 // ----------------------------------------------------------------------------
 
 // General features
 // ----------------------------------------------------------------------------
 

+#define wxUSE_FILESYSTEM       1 // better have this is you want to compile wxHTML
+

 #define wxUSE_PCX              1 // Utilize PCX images
 
 #define wxUSE_PNM              1 // Utilize PNM images
 #define wxUSE_PCX              1 // Utilize PCX images
 
 #define wxUSE_PNM              1 // Utilize PNM images


@@ -33,7 +35,7 @@
 #define wxUSE_GIF              1 // Utilize GIF images
 
 #if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
 #define wxUSE_GIF              1 // Utilize GIF images
 
 #if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )

-#define wxUSE_LONG_LONG        1
+#define wxUSE_LONGLONG        1

 #endif
 
 #define wxUSE_NET_API          1 // Utilize OS/2's UPM netapi's
 #endif
 
 #define wxUSE_NET_API          1 // Utilize OS/2's UPM netapi's


@@ -63,6 +65,9 @@
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions
 
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions
 

+#define wxUSE_PLOT        1
+                                // 0 for no generic plot functions
+

 #define wxUSE_SPLINES     1
                                     // 0 for no splines
 
 #define wxUSE_SPLINES     1
                                     // 0 for no splines
 


@@ -144,7 +149,11 @@
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)

+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#else

 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1

+#endif

                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 


@@ -159,16 +168,26 @@
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 

-#define wxUSE_ODBC                0
+#define wxUSE_ODBC                1

                                   // Define 1 to use ODBC classes
 
                                   // 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
+#define wxODBC_FWD_ONLY_CURSORS        1
+                                  // For backward compatibility reasons, this parameter now only
+                                  // controls the default scrolling method used by cursors.  This
+                                  // default behavior can be overriden by setting the second param
+                                  // of wxDB::GetDbConnection() to indicate whether the connection
+                                  // (and any wxTable()s that use the connection) should support
+                                  // forward only scrolling of cursors, or both forward and backward
+                                  // Support for backward scrolling cursors is dependent on the
+                                  // data source as well as the ODBC driver being used.
+
+#define wxODBC_BACKWARD_COMPATABILITY 0
+                                  // Default is 0.  Set to 1 to use the deprecated classes, enum
+                                  // types, function, member variables.  With a setting of 1, full
+                                  // backward compatability with the 2.0.x release is possible.
+                                  // It is STRONGLY recommended that this be set to 0, as
+                                  // future development will be done only on the non-deprecated
+                                  // functions/classes/member variables/etc.

 
 #define wxUSE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>
 
 #define wxUSE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>


@@ -259,6 +278,9 @@
 // wxStatusBar class
 #define wxUSE_STATUSBAR 1
 
 // wxStatusBar class
 #define wxUSE_STATUSBAR 1
 

+// wxSpinCtrl class
+#define wxUSE_SPINCTRL 1
+

 // progress dialog class for lengthy operations
 #define wxUSE_PROGRESSDLG 1
 
 // progress dialog class for lengthy operations
 #define wxUSE_PROGRESSDLG 1