fixed wxImage->wxBitmap conversion for images with alpha channel

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 21080fc0436a384bad8150416536fb2a5fd520b1..8dcdd0eeefb2ced9c52b0df6fdd2d66e9ad38417 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -16,12 +16,16 @@
 // global settings
 // ----------------------------------------------------------------------------
 
+#define wxUSE_EXCEPTIONS    1
+
 // 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 1 when adding support for multiple displays/screens
+#define wxUSE_DISPLAY        0
 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------
@@ -77,7 +81,8 @@
                                 // 0 for no drag and drop
 
 #define wxUSE_CONTROLS     1    // Do not change
-#define wxUSE_POPUPWIN     0    // OS/2 does not use this
+#define wxUSE_POPUPWIN     1    //
+#define wxUSE_TIPWINDOW    1    //
 
 // Recommended setting: 1
 #define wxUSE_BUTTON       1    // wxButton
@@ -117,13 +122,11 @@
 #define wxUSE_MIMETYPE     1
 #define wxUSE_MSGDLG       1
 #define wxUSE_NOTEBOOK     1
+#define wxUSE_LISTBOOK     1
 #define wxUSE_SPLITTER     1
 #define wxUSE_STOPWATCH    1
 #define wxUSE_TAB_DIALOG   1
 #define wxUSE_WXHTML_HELP  1
-#define wxUSE_BUTTONBAR     1
-                                    // Define 1 to use buttonbar classes (enhanced toolbar
-                                    // for MS Windows)
 
 #define wxUSE_RADIOBUTTON   1
                                     // Define 1 to use radio button control
@@ -142,7 +145,7 @@
 #define wxUSE_RESOURCE_LOADING_IN_OS2     1
                                     // Use dynamic icon/cursor loading/saving code
                                     // under OS2.
-#define wxUSE_WX_RESOURCES        1
+#define wxUSE_WX_RESOURCES        0
                                   // Use .wxr resource mechanism (requires PrologIO library)
 
 // support for startup tips (wxShowTip &c)
@@ -150,6 +153,8 @@
 
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
                                   // Set to 0 to disable document/view architecture
+#define wxUSE_MDI 1
+
 #define wxUSE_MDI_ARCHITECTURE  1
                                   // Set to 0 to disable MDI document/view architecture
 #define wxUSE_PRINTING_ARCHITECTURE  1
@@ -220,7 +225,7 @@
                                   // 0 for <iostream>
 
 #define wxUSE_STREAMS       1
-                                  // If enabled (1), compiles wxWindows streams classes
+                                  // If enabled (1), compiles wxWidgets streams classes
 
 #define wxUSE_STD_IOSTREAM  1
                                   // Use standard C++ streams if 1. If 0, use wxWin
@@ -246,14 +251,17 @@
                                   // Set to 1 for PNM format support
 #define wxUSE_PCX           1
                                   // Set to 1 for PCX format support
+#define wxUSE_IFF           1
+                                  // Set to 1 for IFF format support
 #define wxUSE_XPM           1
                                   // Set to 1 for XPM format support
 
+
+#define wxUSE_ICO_CUR       1
+                                  // Set to 1 for MS Icons and Cursors format support
+
 #define wxUSE_SERIAL        1
                                   // Use serialization (requires utils/serialize)
-#define wxUSE_DYNLIB_CLASS  1
-                                  // Compile in wxLibrary class for run-time
-                                  // DLL loading and function calling
 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method
@@ -287,6 +295,9 @@
 
 #define wxUSE_FFILE         1
 
+// use wxTextBuffer class: required by wxTextFile
+#define wxUSE_TEXTBUFFER    1
+
 // use wxTextFile class: requires wxFile, required by wxConfig
 #define wxUSE_TEXTFILE            1
 
@@ -308,6 +319,9 @@
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 
+// use the number dialog
+#define wxUSE_NUMBERDLG 1
+
 // wxToolBar class
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
@@ -322,14 +336,12 @@
 #define wxUSE_PROGRESSDLG 1
 
 // wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
+#define wxUSE_DIRDLG  1
+#define wxUSE_DIRDLGG 1
 
 #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
  *
@@ -356,7 +368,7 @@
                                 // needed for wxCanvas
 #define wxUSE_MENUS               1
 
-#define wxUSE_WAVE                1
+#define wxUSE_SOUND                1
 
 #define wxUSE_REGEX               1
 
@@ -372,5 +384,22 @@
     #define NO_TEXT_WINDOW_STREAM     1  // defined in textctrl.h for DLL builds
 #endif
 
+#define wxUSE_UNICODE      0
+#define wxUSE_UNICODE_MSLU 0
+
+#define wxUSE_DYNLIB_CLASS  1
+                                  // Compile in wxLibrary class for run-time
+                                  // DLL loading and function calling
+#define wxUSE_DYNAMIC_LOADER 0
+
+#define wxUSE_WCHAR_T           1
+#define wxUSE_PROTOCOL          1
+#define wxUSE_URL               1
+#define wxUSE_PROTOCOL_HTTP     1
+#define wxUSE_PROTOCOL_FTP      1
+#define wxUSE_PROTOCOL_FILE     1
+
+#define wxUSE_GENERIC_MDI_AS_NATIVE 1
+
 #endif
     // _WX_SETUP_H_