1. extracted MSW-specific part of wxDynamicLibrary in msw/dlmsw.cpp

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index e7724688d568f1abf15bb7e40fe69285db8bd6f3..9b4e88ed66eaa2d3c5c5e739c0eb1a97759d18f4 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -18,9 +18,6 @@
 
 #define wxUSE_EXCEPTIONS    1
 
 
 #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 0 when building wxBase library
 #define wxUSE_GUI            1
 


@@ -371,6 +368,32 @@
 
 #define wxUSE_SOUND                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
 
 #define wxUSE_FINDREPLDLG         1 // Find replace dialog
 #define wxUSE_REGEX               1
 
 #define wxUSE_FINDREPLDLG         1 // Find replace dialog