Compilation fix for Cygwin

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

diff --git a/contrib/samples/mmedia/mmbman.cpp b/contrib/samples/mmedia/mmbman.cpp
index 9da1bea03eb09087f56edd1179ad2ed646c7e551..ab4f5c8c5477e8465dfa0fbefa9ed853833292b1 100644 (file)
--- a/contrib/samples/mmedia/mmbman.cpp
+++ b/contrib/samples/mmedia/mmbman.cpp
@@ -355,9 +355,9 @@ MMBoardVideoFile::MMBoardVideoFile(const wxString& filename)
 {
     m_output_window = NULL;
 
-#if defined(__UNIX__)
+#if defined(__UNIX__) && !defined(__CYGWIN__)
     m_video_driver = new wxVideoXANIM(filename);
-#elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__)
+#elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) && !defined(__CYGWIN__)
     // versions of Open Watcom and MinGW tested against this source does not
     // deliver "digitalv.h" required in this feature
     m_video_driver = new wxVideoWindows(filename);
@@ -510,7 +510,10 @@ DECLARE_APP(MMBoardApp)
 
 wxSoundStream *MMBoardManager::OpenSoundStream()
 {
-#ifdef __UNIX__
+#ifdef __WIN32__
+  if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0)
+    return new wxSoundStreamWin();
+#elif __UNIX__
   if ((wxGetApp().m_caps & MM_SOUND_ESD) != 0)
     return new wxSoundStreamESD();
 
@@ -518,11 +521,6 @@ wxSoundStream *MMBoardManager::OpenSoundStream()
     return new wxSoundStreamOSS();
 #endif
 
-#ifdef __WIN32__
-  if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0)
-    return new wxSoundStreamWin();
-#endif
-
   wxMessageBox(_T("You are trying to open a multimedia but you have not devices"), _T("Error"), wxOK | wxICON_ERROR, NULL);
 
   return NULL;

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 7b64a14b3636695a0db51ab129dc6790a8cb04c8..3015dd5308f565c1de9d7500fb2ad0b214e9bf33 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -198,7 +198,15 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
 
     caps = 0;
 
-#ifdef __UNIX__
+#ifdef __WIN32__
+    // We test the Windows sound support.
+
+    dev = new wxSoundStreamWin();
+    if (dev->GetError() == wxSOUND_NOERROR)
+        caps |= MM_SOUND_WIN;
+    delete dev;
+
+#elif defined __UNIX__
     // We now test the ESD support
 
     dev = new wxSoundStreamESD();
@@ -221,15 +229,6 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
     }
 #endif
 
-#endif
-
-#ifdef __WIN32__
-    // We test the Windows sound support.
-
-    dev = new wxSoundStreamWin();
-    if (dev->GetError() == wxSOUND_NOERROR)
-        caps |= MM_SOUND_WIN;
-    delete dev;
 #endif
 
     return caps;