Some compilation fixes

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 802b4b91da74d7f93ba3430d0ff2f905c7b65875..aaae8c273dfd8ad53a1e419fadea2355c6efccc4 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -16,32 +16,31 @@
 // global settings
 // ----------------------------------------------------------------------------
 
 // 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 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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------
 

-#define wxUSE_NET_API          0 // Utilize OS/2's UPM netapi's
+#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_LONG_LONG        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 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
 #define wxUSE_POSTSCRIPT  1
                             // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 1


@@ -70,8 +69,6 @@
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
 #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)
 #define wxUSE_BUTTONBAR     1
                                     // Define 1 to use buttonbar classes (enhanced toolbar
                                     // for MS Windows)


@@ -106,10 +103,6 @@
 
 #define wxUSE_CHECKLISTBOX 1
                                     // Define 1 to compile check listbox
 
 #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
 #define wxUSE_CARET       1
                                     // Define 1 to use wxCaret class
 #define wxUSE_XPM_IN_OS2  1


@@ -173,7 +166,7 @@
                                   // 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
                                   // 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 
+                                  // that you will use these odbc classes with allow backward

                                   // scrolling cursors, this setting should remain set to 1
                                   // for maximum database/driver compatibilty
 
                                   // scrolling cursors, this setting should remain set to 1
                                   // for maximum database/driver compatibilty
 


@@ -261,10 +254,14 @@
 
 // wxToolBar class
 #define wxUSE_TOOLBAR 1
 
 // wxToolBar class
 #define wxUSE_TOOLBAR 1

+#define wxUSE_TOOLBAR_NATIVE 1

 
 // 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
 


@@ -286,8 +283,6 @@
                                     // complains about deallocating
                                     // arrays of wxPoints if wxPoint is a class.
 
                                     // 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)
 #define wxUSE_PORTABLE_FONTS_IN_OS2  0
                                 // Define 1 to use new portable font scheme in Windows
                                 // (used by default under X)