X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f5c180eba88f20438789e1a84a435ed8615fbff..a76d8a29531683cc1c82294ce0c894886f09c404:/include/wx/os2/setup0.h?ds=sidebyside

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 59a5b1b189..9b4e88ed66 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -16,12 +16,13 @@
 // global settings
 // ----------------------------------------------------------------------------
 
-// define this to 1 if you want icons to behave as bitmaps
-#define wxICON_IS_BITMAP     0
+#define wxUSE_EXCEPTIONS    1
 
 // 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
 // ----------------------------------------------------------------------------
@@ -118,13 +119,12 @@
 #define wxUSE_MIMETYPE     1
 #define wxUSE_MSGDLG       1
 #define wxUSE_NOTEBOOK     1
+#define wxUSE_LISTBOOK     1
+#define wxUSE_CHOICEBOOK   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
@@ -151,6 +151,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
@@ -197,7 +199,7 @@
 #define wxUSE_ODBC                1
                                   // Define 1 to use ODBC classes
 
-#define wxODBC_FWD_ONLY_CURSORS	1
+#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
@@ -221,7 +223,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
@@ -338,9 +340,6 @@
 #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
  *
@@ -367,7 +366,33 @@
                                 // needed for wxCanvas
 #define wxUSE_MENUS               1
 
-#define wxUSE_WAVE                1
+#define wxUSE_SOUND                1
+
+// Use wxMediaCtrl
+//
+// Default is 0.
+//
+// Recommended setting: 0
+#define wxUSE_MEDIACTRL     0
+
+// Use wxWidget's XRC XML-based resource system.  Recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (requires wxUSE_XML)
+#define wxUSE_XRC       1
+
+// XML parsing classes. Note that their API will change in the future, so
+// using wxXmlDocument and wxXmlNode in your app is not recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (required by XRC)
+#if wxUSE_XRC
+#  define wxUSE_XML       1
+#else
+#  define wxUSE_XML       0
+#endif
 
 #define wxUSE_REGEX               1