regenerated after last changes

[wxWidgets.git] / contrib / samples / mmedia / mmboard.cpp

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 7b64a14b3636695a0db51ab129dc6790a8cb04c8..62bf71c08cc7c50452cd27915058fe31ef480dbb 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -16,9 +16,6 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifdef __GNUG__
-    #pragma implementation "mmboard.h"
-#endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
@@ -36,8 +33,9 @@
 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
+
 // the application icon
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if !defined(__WXMSW__) && !defined(__WXPM__)
     #include "mondrian.xpm"
 #endif
 
@@ -198,7 +196,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 +227,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;
@@ -426,8 +423,10 @@ void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
     }
 
     // select a file to be opened
+#if wxUSE_FILEDLG
     selected_file = wxLoadFileSelector(_T("multimedia"), _T("*"), NULL, this);
-    if (selected_file.IsNull())
+#endif // wxUSE_FILEDLG
+    if (selected_file.empty())
         return;
 
     m_opened_file = MMBoardManager::Open(selected_file);
@@ -591,4 +590,3 @@ void MMBoardFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event))
 
     UpdateMMedInfo();
 }
-