Rich text lib separation.

[wxWidgets.git] / src / mac / classic / sound.cpp

diff --git a/src/mac/classic/sound.cpp b/src/mac/classic/sound.cpp
index ac38fda299a94216cbf5eba322cf68d223baf9da..8f3eed837ebd47b4a2f83db222de4bd19c7edf3a 100644 (file)
--- a/src/mac/classic/sound.cpp
+++ b/src/mac/classic/sound.cpp
@@ -1,20 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sound.cpp
+// Name:        src/mac/classic/sound.cpp

 // Purpose:     wxSound class implementation: optional
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxSound class implementation: optional
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/sound.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_SOUND
 
 
 #if wxUSE_SOUND
 

+#include "wx/sound.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/string.h"
+#endif
+

 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__


@@ -135,14 +141,14 @@ bool wxSound::DoPlay(unsigned flags) const
 
     if (m_isResource)
     {
 
     if (m_isResource)
     {

-       Str255 snd ;
-       wxMacStringToPascal( m_sndname , snd ) ;
-       SndListHandle hSnd;
+        Str255 snd ;
+        wxMacStringToPascal( m_sndname , snd ) ;
+        SndListHandle hSnd;

 
 

-       hSnd = (SndListHandle) GetNamedResource('snd ', snd);
+        hSnd = (SndListHandle) GetNamedResource('snd ', snd);

 
 

-       if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, (flags & wxSOUND_ASYNC)) == noErr))
-               ret = true;
+        if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, (flags & wxSOUND_ASYNC)) == noErr))
+            ret = true;

     }
 
     return ret;
     }
 
     return ret;


@@ -235,5 +241,4 @@ void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
     KillTimer(0,timerID);
 }*/
 
     KillTimer(0,timerID);
 }*/
 

-
-#endif
+#endif // wxUSE_SOUND