Added wxUSE_TOOLTIPS guard for previous patch

[wxWidgets.git] / src / mac / wave.cpp

diff --git a/src/mac/wave.cpp b/src/mac/wave.cpp
index 0c5aac8bfcc5fee2bbc1a495ac24e6804cfc1305..35accb91670fa30805afea67f65bf90a326b5dc5 100644 (file)
--- a/src/mac/wave.cpp
+++ b/src/mac/wave.cpp
@@ -135,23 +135,18 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
 //don't know what to do with looped, wth
 bool wxWave::Play(bool async, bool looped) const
 {
-    char lpSnd[32];
     bool ret = false;
 
     if (m_isResource)
     {
-#if TARGET_CARBON
-      c2pstrcpy((unsigned char *)lpSnd, m_sndname);
-#else
-      strcpy(lpSnd, m_sndname);
-      c2pstr((char *) lpSnd);
-#endif
-      SndListHandle hSnd;
+       Str255 snd ;
+       wxMacStringToPascal( m_sndname , snd ) ;
+       SndListHandle hSnd;
 
-      hSnd = (SndListHandle) GetNamedResource('snd ',(const unsigned char *) lpSnd);
+       hSnd = (SndListHandle) GetNamedResource('snd ', snd);
 
-      if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, async) == noErr))
-        ret = true;
+       if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, async) == noErr))
+               ret = true;
     }
 
     return ret;