switched to using wxPopupWindow

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 7b6675b73c787620b2086217805650ee935529e9..9b4e88ed66eaa2d3c5c5e739c0eb1a97759d18f4 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -18,9 +18,6 @@
 
 #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
 
@@ -123,13 +120,11 @@
 #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
@@ -204,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
@@ -373,6 +368,32 @@
 
 #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
 
 #define wxUSE_FINDREPLDLG         1 // Find replace dialog