send wxEVT_MENU_CLOSE at least sometimes

[wxWidgets.git] / src / unix / sound.cpp

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 3871409e7ee0c944e9b269d19d5aa38c8879fdad..fbd980238369c95ecb1ccf271164dadcb1ca212a 100644 (file)
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -9,11 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sound.h"
-#pragma implementation "soundbase.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -452,7 +447,8 @@ wxSound::~wxSound()
     Free();
 }
 
     Free();
 }
 

-bool wxSound::Create(const wxString& fileName, bool isResource)
+bool wxSound::Create(const wxString& fileName,
+                     bool WXUNUSED_UNLESS_DEBUG(isResource))

 {
     wxASSERT_MSG( !isResource,
              _T("Loading sound from resources is only supported on Windows") );
 {
     wxASSERT_MSG( !isResource,
              _T("Loading sound from resources is only supported on Windows") );


@@ -471,7 +467,7 @@ bool wxSound::Create(const wxString& fileName, bool isResource)
 
     size_t len = wx_truncate_cast(size_t, lenOrig);
     wxUint8 *data = new wxUint8[len];
 
     size_t len = wx_truncate_cast(size_t, lenOrig);
     wxUint8 *data = new wxUint8[len];

-    if (fileWave.Read(data, len) != len)
+    if ( fileWave.Read(data, len) != lenOrig )

     {
         wxLogError(_("Couldn't load sound data from '%s'."), fileName.c_str());
         return false;
     {
         wxLogError(_("Couldn't load sound data from '%s'."), fileName.c_str());
         return false;