Applied patch [ 1194316 ] wxMediaCtrl MSW config and setup cleanup

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

diff --git a/configure.in b/configure.in
index db8eb04df0aab4b7391f570f67c06a4fe905e32a..543af2e22491a5470f6b995a81929af6778974f5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -437,7 +437,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_SOUND=no
   DEFAULT_wxUSE_MEDIACTRL=no  
   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_SOUND=no
   DEFAULT_wxUSE_MEDIACTRL=no  

-  DEFAULT_wxUSE_DIRECTSHOW=no  

   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=no
   DEFAULT_wxUSE_FONTMAP=no
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=no
   DEFAULT_wxUSE_FONTMAP=no


@@ -634,7 +633,6 @@ else
   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_SOUND=yes
   DEFAULT_wxUSE_MEDIACTRL=no
   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_SOUND=yes
   DEFAULT_wxUSE_MEDIACTRL=no

-  DEFAULT_wxUSE_DIRECTSHOW=no

   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=yes
   DEFAULT_wxUSE_FONTMAP=yes
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=yes
   DEFAULT_wxUSE_FONTMAP=yes


@@ -6219,24 +6217,6 @@ dnl wxMediaCtrl
 dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_MEDIACTRL" = "yes"; then
 dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_MEDIACTRL" = "yes"; then

-    if test "$wxUSE_MSW" = 1; then
-    dnl -----------------------------------------------------------------------
-    dnl DirectShow MSW
-    dnl -----------------------------------------------------------------------
-        wxUSE_DIRECTSHOW="yes"
-        AC_CHECK_HEADERS([dshow.h], [],
-            [
-                wxUSE_DIRECTSHOW="no"
-                AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
-            ],
-            [#include <windows.h>])
-
-       if test "$wxUSE_DIRECTSHOW" = "yes"; then
-            AC_DEFINE(wxUSE_DIRECTSHOW)
-            LIBS="$LIBS -lstrmiids"
-       fi
-    fi
-

     dnl -----------------------------------------------------------------------
     dnl GStreamer 
     dnl -----------------------------------------------------------------------
     dnl -----------------------------------------------------------------------
     dnl GStreamer 
     dnl -----------------------------------------------------------------------

diff --git a/include/wx/msw/wince/chkconf.h b/include/wx/msw/wince/chkconf.h
index b971317ef60b3d7bcdc2f472abbaa75caa3b2326..35fb198c77ccfdfa98d1810717dda76849c138c1 100644 (file)
--- a/include/wx/msw/wince/chkconf.h
+++ b/include/wx/msw/wince/chkconf.h
@@ -35,9 +35,6 @@
 #define wxUSE_ON_FATAL_EXCEPTION 0
 
 // media stuff not supported under CE
 #define wxUSE_ON_FATAL_EXCEPTION 0
 
 // media stuff not supported under CE

-#undef wxUSE_DIRECTSHOW
-#define wxUSE_DIRECTSHOW 0
-

 #undef wxUSE_MEDIACTRL
 #define wxUSE_MEDIACTRL 0
 
 #undef wxUSE_MEDIACTRL
 #define wxUSE_MEDIACTRL 0
 

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index eea5cf1dffd03ab725c13a8eb254604db7359a49..f459983f32ff565bb3a12f48dc3c3ff5b7a2c249 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -484,20 +484,6 @@
 // Recommended setting: 1 
 #define wxUSE_MEDIACTRL     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 (requires linkage to strmiids.lib)
-//
-// Default is 0
-//
-// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
-#define wxUSE_DIRECTSHOW    0
-

 // Use GStreamer for Unix (req a lot of dependancies)
 //
 // Default is 0
 // Use GStreamer for Unix (req a lot of dependancies)
 //
 // Default is 0

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 6f65bf9987fda91d8fb89090f5dbb8caecc78e88..e203bb3b288d1e4f3e3cbb9acf579c0419fb24f9 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -58,11 +58,6 @@ extern WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName;
 //
 //---------------------------------------------------------------------------
 
 //
 //---------------------------------------------------------------------------
 

-//---------------------------------------------------------------------------
-//  Compilation guard for DirectShow
-//---------------------------------------------------------------------------
-#if wxUSE_DIRECTSHOW
-

 //---------------------------------------------------------------------------
 //  COM includes
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //  COM includes
 //---------------------------------------------------------------------------


@@ -764,8 +759,6 @@ public:
     DECLARE_DYNAMIC_CLASS(wxAMMediaBackend);
 };
 
     DECLARE_DYNAMIC_CLASS(wxAMMediaBackend);
 };
 

-#endif //wxUSE_DIRECTSHOW
-

 //---------------------------------------------------------------------------
 //
 //  wxMCIMediaBackend
 //---------------------------------------------------------------------------
 //
 //  wxMCIMediaBackend


@@ -834,11 +827,6 @@ public:
 //
 //---------------------------------------------------------------------------
 
 //
 //---------------------------------------------------------------------------
 

-//---------------------------------------------------------------------------
-//  QT Compilation Guard
-//---------------------------------------------------------------------------
-#if wxUSE_QUICKTIME
-

 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------


@@ -1089,10 +1077,6 @@ public:
     DECLARE_DYNAMIC_CLASS(wxQTMediaBackend);
 };
 
     DECLARE_DYNAMIC_CLASS(wxQTMediaBackend);
 };
 

-//---------------------------------------------------------------------------
-//  End QT Compilation Guard
-//---------------------------------------------------------------------------
-#endif //wxUSE_QUICKTIME

 
 //===========================================================================
 //  IMPLEMENTATION
 
 //===========================================================================
 //  IMPLEMENTATION


@@ -1104,11 +1088,6 @@ public:
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 

-//---------------------------------------------------------------------------
-// Only use if user wants it -
-//---------------------------------------------------------------------------
-#if wxUSE_DIRECTSHOW
-

 IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend);
 
 // Numerical value for when the graph reaches the stop position
 IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend);
 
 // Numerical value for when the graph reaches the stop position


@@ -1300,17 +1279,8 @@ bool wxAMMediaBackend::Load(const wxString& fileName)
         return false;
     }
 
         return false;
     }
 

-#if defined(_WIN32)
-    ::SetWindowLong(m_hNotifyWnd, GWL_WNDPROC,
-                       (LONG)wxAMMediaBackend::NotifyWndProc);
-    ::SetWindowLong(m_hNotifyWnd, GWL_USERDATA,
-                       (LONG) this);
-#else
-    ::SetWindowLongPtr(m_hNotifyWnd, GWLP_WNDPROC,
-                       (LONG_PTR)wxAMMediaBackend::NotifyWndProc);
-    ::SetWindowLongPtr(m_hNotifyWnd, GWL_USERDATA,
-                       (LONG) this);
-#endif
+    wxSetWindowProc(m_hNotifyWnd, wxAMMediaBackend::NotifyWndProc);
+    wxSetWindowUserData(m_hNotifyWnd, (void*)this);

 
 
     wxAMVERIFY( m_pME->SetNotifyWindow((LONG_PTR)m_hNotifyWnd,
 
 
     wxAMVERIFY( m_pME->SetNotifyWindow((LONG_PTR)m_hNotifyWnd,


@@ -1625,7 +1595,6 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), int w, int h)
 //---------------------------------------------------------------------------
 // End of wxAMMediaBackend
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // End of wxAMMediaBackend
 //---------------------------------------------------------------------------

-#endif //wxUSE_DIRECTSHOW

 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //


@@ -1839,13 +1808,7 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
         return false;
     }
 
         return false;
     }
 

-#if defined(_WIN32)
-    ::SetWindowLong(m_hNotifyWnd, GWL_WNDPROC,
-                       (LONG)wxMCIMediaBackend::NotifyWndProc);
-#else
-    ::SetWindowLongPtr(m_hNotifyWnd, GWLP_WNDPROC,
-                       (LONG_PTR)wxMCIMediaBackend::NotifyWndProc);
-#endif
+    wxSetWindowProc(m_hNotifyWnd, wxMCIMediaBackend::NotifyWndProc);

 
     ::SetWindowLong(m_hNotifyWnd, GWL_USERDATA,
                        (LONG) this);
 
     ::SetWindowLong(m_hNotifyWnd, GWL_USERDATA,
                        (LONG) this);


@@ -2187,8 +2150,6 @@ LRESULT CALLBACK wxMCIMediaBackend::OnNotifyWndProc(HWND hWnd, UINT nMsg,
 // TODO: Dynamically load from qtml.dll
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 // TODO: Dynamically load from qtml.dll
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 

-#if wxUSE_QUICKTIME
-

 IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 //Time between timer calls
 IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 //Time between timer calls


@@ -2680,9 +2641,8 @@ void wxQTMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), int w, int h)
 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------

-//  End QT Compilation Guard
+//  End QT Backend

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

-#endif //wxUSE_QUICKTIME

 
 //in source file that contains stuff you don't directly use
 #include <wx/html/forcelnk.h>
 
 //in source file that contains stuff you don't directly use
 #include <wx/html/forcelnk.h>