added a few more composite functions

[wxWidgets.git] / include / wx / msw / setup_microwin.h

diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index 21b62558cd5732cd9fa07fde8066b27b036be9ef..8f291d8ecd885822bebef8e203c3c3832b50de5f 100644 (file)
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -28,7 +28,7 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
 // compatibility settings
 // ----------------------------------------------------------------------------
 

-// This setting determines the compatibility with 2.0 API: set it to 1 to
+// This setting determines the compatibility with 2.2 API: set it to 1 to

 // enable it
 //
 // Default is 1.
 // enable it
 //
 // Default is 1.


@@ -36,27 +36,6 @@
 // Recommended setting: 0 (please update your code instead!)
 #define WXWIN_COMPATIBILITY_2_2 1
 
 // Recommended setting: 0 (please update your code instead!)
 #define WXWIN_COMPATIBILITY_2_2 1
 

-// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
-// but this is very dangerous because you can mistakenly pass an icon instead
-// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
-// because an icon is not a valid bitmap
-//
-// Starting from 2.1.12, you have the choice under this backwards compatible
-// behaviour (your code will still compile, but probably won't behave as
-// expected!) and not deriving wxIcon class from wxBitmap, but providing a
-// conversion ctor wxBitmap(const wxIcon&) instead.
-//
-// Recommended setting: 0
-#define wxICON_IS_BITMAP    0
-
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-

 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //
 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
 // If migrating between versions, your dialogs may seem to shrink.
 //


@@ -392,12 +371,26 @@
 // wxSound class
 #define wxUSE_SOUND      0
 
 // wxSound class
 #define wxUSE_SOUND      0
 

-// wxMovieCtrl class
+// Use wxMediaCtrl

 //
 //

-// Requires DirectX 7 & DirectMedia or above (link with STRMIIDS.LIB)
+// Default is 1.
+//
+// Recommended setting: 1 
+#define wxUSE_MEDIACTRL     1
+
+// Use QuickTime
+//
+// Default is 0
+//
+// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
+#define wxUSE_QUICKTIME     0
+
+// Use DirectShow
+//
+// Default is 0

 //
 //

-// Recommended setting: 0 (Nice to have, but SDK doesn't exist by default)
-#define wxUSE_MOVIECTRL 0
+// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
+#define wxUSE_DIRECTSHOW    1

 
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //