unicode fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index e346f5c9d4f2029e338cd98eb88c3eed50a67ab4..3c4920a0cbb3b2151862179db165aeeac04874bd 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -228,7 +228,7 @@ inline bool wxInitQT ()
     }
     else
     {
     }
     else
     {

-        wxLogSysError("Quicktime is not installed, or Your Version of Quicktime is <= 4.");
+        wxLogSysError(wxT("Quicktime is not installed, or Your Version of Quicktime is <= 4."));

         return false;
     }
 }
         return false;
     }
 }


@@ -273,7 +273,7 @@ bool wxSound::Create(const wxString& fileName, bool isResource)
 
         wxMacStringToPascal( fileName , lpSnd ) ;
 
 
         wxMacStringToPascal( fileName , lpSnd ) ;
 

-        m_sndname = lpSnd;
+        m_sndname = fileName;

         m_hSnd = (char*) GetNamedResource('snd ', (const unsigned char *) lpSnd);
 #else
         return false;
         m_hSnd = (char*) GetNamedResource('snd ', (const unsigned char *) lpSnd);
 #else
         return false;


@@ -322,7 +322,7 @@ bool wxSound::DoPlay(unsigned flags) const
                 miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFC);
             else
             {
                 miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFC);
             else
             {

-                wxLogSysError("wxSound - Location in memory does not contain valid data");
+                wxLogSysError(wxT("wxSound - Location in memory does not contain valid data"));

                 return false;
             }
 
                 return false;
             }
 


@@ -435,7 +435,7 @@ bool wxSound::DoPlay(unsigned flags) const
 
     if (flags & wxSOUND_SYNC)
     {
 
     if (flags & wxSOUND_SYNC)
     {

-        wxASSERT_MSG(!(flags & wxSOUND_LOOP), "Can't loop and play syncronously at the same time");
+        wxASSERT_MSG(!(flags & wxSOUND_LOOP), wxT("Can't loop and play syncronously at the same time"));

 
         //Play movie until it ends, then exit
         while (!IsMovieDone(movie))
 
         //Play movie until it ends, then exit
         while (!IsMovieDone(movie))