Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

[wxWidgets.git] / contrib / src / mmedia / vidwin.cpp

diff --git a/contrib/src/mmedia/vidwin.cpp b/contrib/src/mmedia/vidwin.cpp
index e763ac8df2a684d8f2f539fb19c74dbc1c953ca2..d5f1c4741ed0d523c0e6bc7f6ccef8fcbb6b3b3c 100644 (file)
--- a/contrib/src/mmedia/vidwin.cpp
+++ b/contrib/src/mmedia/vidwin.cpp
@@ -18,7 +18,9 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__)
+// versions of Open Watcom and MinGW tested against this source does not
+// deliver "digitalv.h" required in this feature

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -48,7 +50,7 @@ wxVideoWindows::wxVideoWindows(wxInputStream& str)
 {
     m_internal    = new wxVIDWinternal;
     m_remove_file = TRUE;
 {
     m_internal    = new wxVIDWinternal;
     m_remove_file = TRUE;

-    m_filename    = wxGetTempFileName("wxvid");
+    m_filename    = wxGetTempFileName(_T("wxvid"));

     m_paused      = FALSE;
     m_stopped     = TRUE;
     m_frameRate   = 1.0;
     m_paused      = FALSE;
     m_stopped     = TRUE;
     m_frameRate   = 1.0;


@@ -84,13 +86,12 @@ void wxVideoWindows::OpenFile()
     MCI_DGV_OPEN_PARMS openStruct;
     MCI_DGV_SET_PARMS setStruct;
     MCI_STATUS_PARMS statusStruct;
     MCI_DGV_OPEN_PARMS openStruct;
     MCI_DGV_SET_PARMS setStruct;
     MCI_STATUS_PARMS statusStruct;

-    DWORD ret;

 
 

-    openStruct.lpstrDeviceType = "avivideo";
-    openStruct.lpstrElementName = (LPSTR)(m_filename.mb_str());
+    openStruct.lpstrDeviceType = _T("avivideo");
+    openStruct.lpstrElementName = (wxChar *)m_filename.c_str();

     openStruct.hWndParent = 0;
     
     openStruct.hWndParent = 0;
     

-    ret = mciSendCommand(0, MCI_OPEN,
+    mciSendCommand(0, MCI_OPEN,

                         MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT,
                          (DWORD)(LPVOID)&openStruct);
     m_internal->m_dev_id = openStruct.wDeviceID;
                         MCI_OPEN_ELEMENT|MCI_DGV_OPEN_PARENT|MCI_OPEN_TYPE|MCI_DGV_OPEN_32BIT,
                          (DWORD)(LPVOID)&openStruct);
     m_internal->m_dev_id = openStruct.wDeviceID;


@@ -99,20 +100,20 @@ void wxVideoWindows::OpenFile()
     setStruct.dwCallback = 0;
     setStruct.dwTimeFormat = MCI_FORMAT_FRAMES;
 
     setStruct.dwCallback = 0;
     setStruct.dwTimeFormat = MCI_FORMAT_FRAMES;
 

-    ret = mciSendCommand(m_internal->m_dev_id, MCI_SET, MCI_SET_TIME_FORMAT,
+    mciSendCommand(m_internal->m_dev_id, MCI_SET, MCI_SET_TIME_FORMAT,

                          (DWORD)(LPVOID)&setStruct);
 
 
     statusStruct.dwCallback = 0;
     statusStruct.dwItem = MCI_DGV_STATUS_FRAME_RATE;
                          (DWORD)(LPVOID)&setStruct);
 
 
     statusStruct.dwCallback = 0;
     statusStruct.dwItem = MCI_DGV_STATUS_FRAME_RATE;

-    ret = mciSendCommand(m_internal->m_dev_id, MCI_STATUS,
+    mciSendCommand(m_internal->m_dev_id, MCI_STATUS,

                          MCI_STATUS_ITEM,
                          (DWORD)(LPVOID)&statusStruct);
 
     m_frameRate = ((double)statusStruct.dwReturn) / 1000;
 
     statusStruct.dwItem = MCI_DGV_STATUS_BITSPERSAMPLE;
                          MCI_STATUS_ITEM,
                          (DWORD)(LPVOID)&statusStruct);
 
     m_frameRate = ((double)statusStruct.dwReturn) / 1000;
 
     statusStruct.dwItem = MCI_DGV_STATUS_BITSPERSAMPLE;

-    ret = mciSendCommand(m_internal->m_dev_id, MCI_STATUS, MCI_STATUS_ITEM,
+    mciSendCommand(m_internal->m_dev_id, MCI_STATUS, MCI_STATUS_ITEM,

                          (DWORD)(LPVOID)&statusStruct);
     m_bps = statusStruct.dwReturn;
 
                          (DWORD)(LPVOID)&statusStruct);
     m_bps = statusStruct.dwReturn;
 


@@ -151,12 +152,12 @@ bool wxVideoWindows::GetSize(wxSize& size) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxVideoWindows::SetSize(wxSize size)
+bool wxVideoWindows::SetSize(wxSize WXUNUSED(size))

 {
     return TRUE;
 }
 
 {
     return TRUE;
 }
 

-bool wxVideoWindows::IsCapable(wxVideoType v_type)
+bool wxVideoWindows::IsCapable(wxVideoType v_type) const

 {
     return (v_type == wxVIDEO_MSAVI);
 }
 {
     return (v_type == wxVIDEO_MSAVI);
 }