don't output -DwxUSE_GUI=0 in cflags by default, do output it if 'base' is specified...

[wxWidgets.git] / samples / sound / sound.cpp

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 8273867d7c9f8fc172978b66b90f58221345fd45..4c4c869c8368bf26f32ed8a56f4f9269eb00b9d3 100644 (file)
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -77,7 +77,7 @@ public:
     void OnAbout(wxCommandEvent& event);
 
     void NotifyUsingFile(const wxString& name);
-    
+
 
 private:
     bool CreateSound(wxSound& snd) const;
@@ -90,7 +90,7 @@ private:
     bool        m_useMemory;
 
     wxTextCtrl* m_tc;
-    
+
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
@@ -159,6 +159,9 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxWidgets Sound Sample"));
 
@@ -981,9 +984,10 @@ void MyFrame::NotifyUsingFile(const wxString& name)
 
 void MyFrame::OnSelectFile(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_FILEDLG
     wxFileDialog dlg(this, _T("Choose a sound file"),
                      wxEmptyString, wxEmptyString,
-                     _T("WAV files (*.wav)|*.wav"), wxOPEN|wxCHANGE_DIR);
+                     _T("WAV files (*.wav)|*.wav"), wxFD_OPEN|wxFD_CHANGE_DIR);
     if ( dlg.ShowModal() == wxID_OK )
     {
         m_soundFile = dlg.GetPath();
@@ -996,6 +1000,7 @@ void MyFrame::OnSelectFile(wxCommandEvent& WXUNUSED(event))
         m_sound = NULL;
         NotifyUsingFile(m_soundFile);
     }
+#endif // wxUSE_FILEDLG
 }
 
 #ifdef __WXMSW__