Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

[wxWidgets.git] / src / osx / sound_osx.cpp

diff --git a/src/osx/sound_osx.cpp b/src/osx/sound_osx.cpp
index ba1f6bb943d287ff7d33cdde611c3c930dbfdd0e..d671a5da22cdb7880fb84f0c36fb171dc454023a 100644 (file)
--- a/src/osx/sound_osx.cpp
+++ b/src/osx/sound_osx.cpp
@@ -2,7 +2,7 @@
 // Name:        src/osx/sound_osx.cpp
 // Purpose:     wxSound class common osx code
 // Author:      Stefan Csomor
 // Name:        src/osx/sound_osx.cpp
 // Purpose:     wxSound class common osx code
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     2009-09-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     2009-09-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor


@@ -35,20 +35,20 @@ public:
     : m_sound(snd)
     {
     }
     : m_sound(snd)
     {
     }

-    
+

     virtual ~wxSoundTimer()
     {
         Stop();
         if (m_sound)
             m_sound->DoStop();
     }
     virtual ~wxSoundTimer()
     {
         Stop();
         if (m_sound)
             m_sound->DoStop();
     }

-    
+

     void Notify()
     {
         if (m_sound)
             m_sound->SoundTask();
     }
     void Notify()
     {
         if (m_sound)
             m_sound->SoundTask();
     }

-    
+

 protected:
     wxSoundData* m_sound;
 };
 protected:
     wxSoundData* m_sound;
 };


@@ -90,7 +90,7 @@ void wxSoundData::CreateAndStartTimer()
     m_pTimer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
 }
 
     m_pTimer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
 }
 

-wxSound::wxSound() 
+wxSound::wxSound()

 {
     Init();
 }
 {
     Init();
 }


@@ -101,7 +101,7 @@ wxSound::wxSound(const wxString& sFileName, bool isResource)
     Create(sFileName, isResource);
 }
 
     Create(sFileName, isResource);
 }
 

-wxSound::wxSound(int size, const wxByte* data)
+wxSound::wxSound(size_t size, const void* data)

 {
     Init();
     Create( size, data );
 {
     Init();
     Create( size, data );


@@ -122,7 +122,7 @@ wxSound::~wxSound()
             break;
         }
     }
             break;
         }
     }

-    
+

     if (isPlaying)
         m_data->MarkForDeletion();
     else
     if (isPlaying)
         m_data->MarkForDeletion();
     else


@@ -142,7 +142,7 @@ bool wxSound::DoPlay(unsigned flags) const
         if ( !m_data->Play(flags) )
             s_soundsPlaying.pop_back();
     }
         if ( !m_data->Play(flags) )
             s_soundsPlaying.pop_back();
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -166,7 +166,7 @@ void wxSound::SoundStopped(const wxSoundData* data)
     for ( wxVector<wxSoundData*>::iterator s = s_soundsPlaying.begin();
          s != s_soundsPlaying.end(); ++s )
     {
     for ( wxVector<wxSoundData*>::iterator s = s_soundsPlaying.begin();
          s != s_soundsPlaying.end(); ++s )
     {

-        if ( (*s) == data ) 
+        if ( (*s) == data )

         {
             s_soundsPlaying.erase(s);
             break;
         {
             s_soundsPlaying.erase(s);
             break;