setp.h changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 818687974b46d7dbc17dbdb2fb3daf2a2fd4f888..7d3316487f2038f12e75edd4cc804c3e1c3e55fe 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -428,6 +428,13 @@
 // wxSound class
 #define wxUSE_SOUND      1
 
 // wxSound class
 #define wxUSE_SOUND      1
 

+// Use wxMediaCtrl
+//
+// Default is 1.
+//
+// Recommended setting: 1 
+#define wxUSE_MEDIACTRL     1
+

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index f3bca4234a08886a6ca47a146b0d17b9a6150c98..6f804466e3259cf66eb7561e2481fbc87bc1ac21 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -459,6 +459,27 @@
 // wxSound class
 #define wxUSE_SOUND      1
 
 // wxSound class
 #define wxUSE_SOUND      1
 

+// Use wxMediaCtrl
+//
+// 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: 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.
 //
 // Default is 1
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1

diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index c3718f7d6e4120d3613eb87dabd7acbd2a1a4176..d241ea6762f533652c0101400b093238faab7371 100644 (file)
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -392,6 +392,27 @@
 // wxSound class
 #define wxUSE_SOUND      0
 
 // wxSound class
 #define wxUSE_SOUND      0
 

+// Use wxMediaCtrl
+//
+// 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: 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.
 //
 // Default is 1
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 058635fac5ecc7395d2a3acea99048c7aad95641..86c960cffc2f31086a6a5d08682d9da17e0609ee 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -447,6 +447,27 @@
 // wxSound class
 #define wxUSE_SOUND      1
 
 // wxSound class
 #define wxUSE_SOUND      1
 

+// Use wxMediaCtrl
+//
+// 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: 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.
 //
 // Default is 1
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 7219859d1a4904a3ec7af558449b103893a8be33..3116862a7f7156ec8b6ec3358e4dd7d356f71cc6 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -371,6 +371,13 @@
 
 #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
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 684ba18aa3aeed77c00394dc0fddcfb57a15849f..9743a02702f4c651c70c1f5c447baa36e1c0f797 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -459,6 +459,8 @@
 // wxSound class
 #define wxUSE_SOUND      0
 
 // wxSound class
 #define wxUSE_SOUND      0
 

+#define wxUSE_MEDIACTRL 0
+

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

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index cf316cda3a5bcc221cfbdbdabdb52743263603d1..fc1d87c29b16326b7fe8f14ffc4890f6c8e06761 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -484,6 +484,27 @@
 // wxSound class
 #define wxUSE_SOUND 1
 
 // wxSound class
 #define wxUSE_SOUND 1
 

+// Use wxMediaCtrl
+//
+// 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: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
+#define wxUSE_DIRECTSHOW    0
+

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