Updates for os/2 -- mostly to allow easier VA debugging

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

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index 0c84daebefa931af0aabb0bf99f6437dc452dbca..c3af84e11c2eb6c267b1d50ffdce84a685700a64 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -16,30 +16,33 @@
 // global settings
 // ----------------------------------------------------------------------------
 
+// define this to 1 if you want icons to behave as bitmaps
+#define wxICON_IS_BITMAP     0
+
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 
-#define WXWIN_COMPATIBILITY  0
-                                // Compatibility with 1.68 API.
-                                // Level 0: no backward compatibility, all new features
-                                // Level 1: Some compatibility. In fact
-                                // the compatibility code is now very minimal so there
-                                // is little advantage to setting it to 1.
-
 // ----------------------------------------------------------------------------
 // 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_GIF              1 // Utilize GIF images
+
+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+#define wxUSE_LONGLONG        1
+#endif
+
+#define wxUSE_NET_API          1 // Utilize OS/2's UPM netapi's
+
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
 
-#define WXWIN_COMPATIBILITY  0
-                                // Compatibility with 1.68 API.
-                                // Level 0: no backward compatibility, all new features
-                                // Level 1: Some compatibility. In fact
-                                // the compatibility code is now very minimal so there
-                                // is little advantage to setting it to 1.
-
 #define wxUSE_POSTSCRIPT  1
                             // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 1
@@ -62,14 +65,15 @@
 #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_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)
@@ -104,10 +108,6 @@
 
 #define wxUSE_CHECKLISTBOX 1
                                     // Define 1 to compile check listbox
-
-#define wxUSE_CHOICE 1
-                                    // Define 1 to compile choice
-
 #define wxUSE_CARET       1
                                     // Define 1 to use wxCaret class
 #define wxUSE_XPM_IN_OS2  1
@@ -149,7 +149,11 @@
                                   // 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
+#endif
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 
@@ -164,8 +168,26 @@
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 
-#define wxUSE_ODBC                   0
-                                    // Define 1 to use ODBC classes
+#define wxUSE_ODBC                1
+                                  // Define 1 to use ODBC classes
+
+#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>
@@ -251,10 +273,14 @@
 
 // wxToolBar class
 #define wxUSE_TOOLBAR 1
+#define wxUSE_TOOLBAR_NATIVE 1
 
 // wxStatusBar class
 #define wxUSE_STATUSBAR 1
 
+// wxSpinCtrl class
+#define wxUSE_SPINCTRL 1
+
 // progress dialog class for lengthy operations
 #define wxUSE_PROGRESSDLG 1
 
@@ -276,8 +302,6 @@
                                     // complains about deallocating
                                     // arrays of wxPoints if wxPoint is a class.
 
-#define wxUSE_DRAG_AND_DROP 1
-
 #define wxUSE_PORTABLE_FONTS_IN_OS2  0
                                 // Define 1 to use new portable font scheme in Windows
                                 // (used by default under X)