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

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

diff --git a/contrib/src/mmedia/cdwin.cpp b/contrib/src/mmedia/cdwin.cpp
index 6d3d7af5301fde54007eb1b30e1b3e865be1f19f..1752cc1810225b093ea4c9eb1c6ee75518e48a95 100644 (file)
--- a/contrib/src/mmedia/cdwin.cpp
+++ b/contrib/src/mmedia/cdwin.cpp
@@ -46,15 +46,14 @@
 IMPLEMENT_DYNAMIC_CLASS(wxCDAudioWin, wxCDAudio)
     
 wxCDAudioWin::wxCDAudioWin(void)
 IMPLEMENT_DYNAMIC_CLASS(wxCDAudioWin, wxCDAudio)
     
 wxCDAudioWin::wxCDAudioWin(void)

-  : wxCDAudio(), m_trksize(NULL), m_trkpos(NULL), m_ok(TRUE), m_toc(NULL)
+  : wxCDAudio(), m_trksize(NULL), m_trkpos(NULL), m_toc(NULL), m_ok(TRUE)

 {
   MCI_OPEN_PARMS open_struct;
   MCI_SET_PARMS set_struct;
 {
   MCI_OPEN_PARMS open_struct;
   MCI_SET_PARMS set_struct;

-  DWORD ret;

 
   m_internal = new CDAW_Internal;
 
   m_internal = new CDAW_Internal;

-  open_struct.lpstrDeviceType = "cdaudio";
-  ret = mciSendCommand(NULL, MCI_OPEN, MCI_OPEN_TYPE,
+  open_struct.lpstrDeviceType = _T("cdaudio");
+  DWORD ret = mciSendCommand((MCIDEVICEID)NULL, MCI_OPEN, MCI_OPEN_TYPE,

                        (DWORD)&open_struct);
   if (ret) {
     m_ok = FALSE;
                        (DWORD)&open_struct);
   if (ret) {
     m_ok = FALSE;


@@ -63,20 +62,20 @@ wxCDAudioWin::wxCDAudioWin(void)
   m_internal->dev_id = open_struct.wDeviceID;
 
   set_struct.dwTimeFormat = MCI_FORMAT_MSF;
   m_internal->dev_id = open_struct.wDeviceID;
 
   set_struct.dwTimeFormat = MCI_FORMAT_MSF;

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

                        (DWORD)(LPVOID)&set_struct);
 
   PrepareToc();
 
   set_struct.dwTimeFormat = MCI_FORMAT_TMSF;
                        (DWORD)(LPVOID)&set_struct);
 
   PrepareToc();
 
   set_struct.dwTimeFormat = MCI_FORMAT_TMSF;

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

                        (DWORD)(LPVOID)&set_struct);
 }
 
 wxCDAudioWin::~wxCDAudioWin(void)
 {
   if (m_ok) {
                        (DWORD)(LPVOID)&set_struct);
 }
 
 wxCDAudioWin::~wxCDAudioWin(void)
 {
   if (m_ok) {

-    mciSendCommand(m_internal->dev_id, MCI_CLOSE, 0, NULL);
+    mciSendCommand(m_internal->dev_id, MCI_CLOSE, 0,(DWORD_PTR)NULL);

     delete m_toc;
     delete[] m_trksize;
     delete[] m_trkpos;
     delete m_toc;
     delete[] m_trksize;
     delete[] m_trkpos;


@@ -89,13 +88,13 @@ void wxCDAudioWin::PrepareToc(void)
   MCI_STATUS_PARMS status_struct;
   wxUint16 i, nb_m_trksize;
   wxCDtime total_time, *trk;
   MCI_STATUS_PARMS status_struct;
   wxUint16 i, nb_m_trksize;
   wxCDtime total_time, *trk;

-  DWORD ret, tmem;
+  DWORD tmem;

 
   if (!m_ok)
     return;
 
   status_struct.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;
 
   if (!m_ok)
     return;
 
   status_struct.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;

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

                  (DWORD)&status_struct);
   nb_m_trksize = status_struct.dwReturn;
 
                  (DWORD)&status_struct);
   nb_m_trksize = status_struct.dwReturn;
 


@@ -103,7 +102,7 @@ void wxCDAudioWin::PrepareToc(void)
   m_trkpos = new wxCDtime[nb_m_trksize+1];
 
   status_struct.dwItem = MCI_STATUS_LENGTH;
   m_trkpos = new wxCDtime[nb_m_trksize+1];
 
   status_struct.dwItem = MCI_STATUS_LENGTH;

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

                  (DWORD)&status_struct);
   total_time.track = nb_m_trksize;
   tmem = status_struct.dwReturn;
                  (DWORD)&status_struct);
   total_time.track = nb_m_trksize;
   tmem = status_struct.dwReturn;


@@ -115,7 +114,7 @@ void wxCDAudioWin::PrepareToc(void)
   for (i=1;i<=nb_m_trksize;i++) {
     status_struct.dwItem = MCI_STATUS_POSITION;
     status_struct.dwTrack = i;
   for (i=1;i<=nb_m_trksize;i++) {
     status_struct.dwItem = MCI_STATUS_POSITION;
     status_struct.dwTrack = i;

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

                    MCI_STATUS_ITEM | MCI_TRACK,
                    (DWORD)(LPVOID)&status_struct);
     tmem = status_struct.dwReturn;
                    MCI_STATUS_ITEM | MCI_TRACK,
                    (DWORD)(LPVOID)&status_struct);
     tmem = status_struct.dwReturn;


@@ -129,7 +128,7 @@ void wxCDAudioWin::PrepareToc(void)
 
     status_struct.dwItem = MCI_STATUS_LENGTH;
     status_struct.dwTrack = i;
 
     status_struct.dwItem = MCI_STATUS_LENGTH;
     status_struct.dwTrack = i;

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

                    MCI_STATUS_ITEM | MCI_TRACK,
                    (DWORD)(LPVOID)&status_struct);
     tmem = status_struct.dwReturn;
                    MCI_STATUS_ITEM | MCI_TRACK,
                    (DWORD)(LPVOID)&status_struct);
     tmem = status_struct.dwReturn;


@@ -202,7 +201,7 @@ wxCDAudio::CDstatus wxCDAudioWin::GetStatus(void)
 wxCDtime wxCDAudioWin::GetTime(void)
 {
   MCI_STATUS_PARMS status_struct;
 wxCDtime wxCDAudioWin::GetTime(void)
 {
   MCI_STATUS_PARMS status_struct;

-  wxCDtime cd_time = {-1, -1, -1, -1};
+  wxCDtime cd_time = {0,0,0,0};

 
   if (!m_ok)
     return cd_time;
 
   if (!m_ok)
     return cd_time;