fix evaluation order bug (patch 1158099)

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

diff --git a/contrib/src/mmedia/sndbase.cpp b/contrib/src/mmedia/sndbase.cpp
index ccd9882652c245b7bd89327b8071d9ab9ca03980..3f4bef7136a8d66df9f1fe3c960e89c8ac17dee1 100644 (file)
--- a/contrib/src/mmedia/sndbase.cpp
+++ b/contrib/src/mmedia/sndbase.cpp
@@ -4,12 +4,13 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
 // CVSID: $Id$
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
 // CVSID: $Id$

+// wxWindows licence

 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndbase.cpp"
 #endif
 
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndbase.cpp"
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"


@@ -34,8 +35,8 @@ wxSoundFormatBase::~wxSoundFormatBase()
 
 wxSoundFormatBase *wxSoundFormatBase::Clone() const
 {
 
 wxSoundFormatBase *wxSoundFormatBase::Clone() const
 {

-    wxLogFatalError(wxT("In wxSoundFormatBase::Clone() but I should"
-                        " not be there"));
+    wxLogFatalError(wxT("In wxSoundFormatBase::Clone() but I should")
+                    wxT(" not be there"));

     return NULL;
 }
 
     return NULL;
 }
 


@@ -72,7 +73,7 @@ wxSoundStream::~wxSoundStream()
 // important function of the wxSoundStream class. It prepares the stream to
 // receive or send the data in a strict format. Normally, the sound stream
 // should be ready to accept any format it is asked to manage but in certain
 // important function of the wxSoundStream class. It prepares the stream to
 // receive or send the data in a strict format. Normally, the sound stream
 // should be ready to accept any format it is asked to manage but in certain

-// cases, it really cannot: in that case it returns FALSE. To have more
+// cases, it really cannot: in that case it returns false. To have more

 // details in the functionnalities of SetSoundFormat see
 // wxSoundRouterStream::SetSoundFormat()
 // --------------------------------------------------------------------------
 // details in the functionnalities of SetSoundFormat see
 // wxSoundRouterStream::SetSoundFormat()
 // --------------------------------------------------------------------------


@@ -84,7 +85,7 @@ bool wxSoundStream::SetSoundFormat(const wxSoundFormatBase& format)
     
     // create a new one by cloning the format passed in parameter
     m_sndformat = format.Clone();
     
     // create a new one by cloning the format passed in parameter
     m_sndformat = format.Clone();

-    return TRUE;
+    return true;

 }
 
 
 }