restored (and slightly improved) wxImage::Scale() fix

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

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index ee6d18b1bcff0a5274e2ed749b17cf229143a6db..562a2b1470e714e4cb01e19fabe7a980b9d77548 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -15,12 +15,6 @@
 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------
-// use TCPV40 from toolkit - EK
-#define TCPV40HDRS
-
-// use double mode + PM GUI and Window text window,
-// to use it you must link your app as "Window"
-#define wxUSE_CONSOLEDEBUG   1
 
 // define this to 1 if you want icons to behave as bitmaps
 #define wxICON_IS_BITMAP     0
@@ -34,12 +28,6 @@
 
 #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
@@ -68,6 +56,12 @@
 #define wxUSE_TIMEDATE    1
                                 // 0 for no wxTime/wxDate classes
 
+#define wxUSE_MENUS       1
+                                // 0 for no menus
+
+#define wxUSE_JOYSTICK    1
+                                // 0 for no joystick functions
+
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions
 
@@ -116,6 +110,8 @@
                                     // Define 1 to compile check listbox
 #define wxUSE_CARET       1
                                     // Define 1 to use wxCaret class
+#define wxUSE_TREECTRL    1
+                                    // Define 1 to use wxTree* classes
 #define wxUSE_XPM_IN_OS2  1
                                     // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_OS2        1
@@ -217,10 +213,23 @@
                                   // and make the library thread safe
 #define wxUSE_ZLIB          1
                                   // Use zlib for compression in streams and PNG code
+#define wxUSE_IMAGE         1
+                                  // Set to 1 for wxImage support (recommended).
 #define wxUSE_LIBPNG        1
-                                  // Use PNG bitmap code
+                                  // Set to 1 for PNG format support
 #define wxUSE_LIBJPEG       1
-                                  // Use JPEG bitmap code
+                                  // Set to 1 for JPEG format support
+#define wxUSE_LIBTIFF       1
+                                  // Set to 1 for TIFF format support
+#define wxUSE_GIF           1
+                                  // Set to 1 for GIF format support
+#define wxUSE_PNM           1
+                                  // Set to 1 for PNM format support
+#define wxUSE_PCX           1
+                                  // Set to 1 for PCX format support
+#define wxUSE_XPM           1
+                                  // Set to 1 for XPM format support
+
 #define wxUSE_SERIAL        1
                                   // Use serialization (requires utils/serialize)
 #define wxUSE_DYNLIB_CLASS  1
@@ -296,6 +305,9 @@
 #define wxUSE_OWNER_DRAWN             1
                                     // Owner-drawn menus and listboxes
 
+#define wxUSE_NEW_GRID 1
+                                // Define 1 to use the new drid classes
+
 /*
  * Any platform
  *
@@ -315,5 +327,13 @@
 #define wxUSE_GENERIC_DIALOGS_IN_OS2 0
                                 // Define 1 to use generic dialogs in Windows, even though
                                 // they duplicate native common dialog (e.g. wxColourDialog)
+
+#define wxUSE_SNGLINST_CHECKER  1
+
+#define wxUSE_GEOMETRY  1
+                                // needed for wxCanvas
+#define wxUSE_MENUS               1
+
+
 #endif
     // _WX_SETUP_H_