Implement comparisons between wxString::iterator and const_iterator.

[wxWidgets.git] / include / wx / osx / sound.h

diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h
index 7b0329bdec3bc1e967d9ff7fc18feff7cd7e63fb..edd8a03bfd117f8fe3383c7e01348daedea433fd 100644 (file)
--- a/include/wx/osx/sound.h
+++ b/include/wx/osx/sound.h
@@ -24,7 +24,7 @@ class WXDLLIMPEXP_ADV wxSoundData
 public :
     wxSoundData();
     virtual ~wxSoundData();
 public :
     wxSoundData();
     virtual ~wxSoundData();

-    
+

     virtual bool Play(unsigned int flags) = 0;
     // stops the sound and deletes the optional timer
     virtual void Stop();
     virtual bool Play(unsigned int flags) = 0;
     // stops the sound and deletes the optional timer
     virtual void Stop();


@@ -33,12 +33,12 @@ public :
     // mark this to be deleted
     virtual void MarkForDeletion();
     virtual bool IsMarkedForDeletion() const { return m_markedForDeletion; }
     // mark this to be deleted
     virtual void MarkForDeletion();
     virtual bool IsMarkedForDeletion() const { return m_markedForDeletion; }

-    
+

     // does the true work of stopping and cleaning up
     virtual void DoStop() = 0;
 protected :
     void CreateAndStartTimer();
     // does the true work of stopping and cleaning up
     virtual void DoStop() = 0;
 protected :
     void CreateAndStartTimer();

-    
+

     unsigned int m_flags;
     wxSoundTimer* m_pTimer;
     bool m_markedForDeletion;
     unsigned int m_flags;
     wxSoundTimer* m_pTimer;
     bool m_markedForDeletion;


@@ -58,16 +58,16 @@ public:
     bool Create(int size, const wxByte* data);
 
     bool IsOk() const { return m_data != NULL; }
     bool Create(int size, const wxByte* data);
 
     bool IsOk() const { return m_data != NULL; }

-    
+

     // Stop playing any sound
     static void Stop();
     // Stop playing any sound
     static void Stop();

-    
+

     // Returns true if a sound is being played
     static bool IsPlaying();
     // Returns true if a sound is being played
     static bool IsPlaying();

-    
+

     // Notification when a sound has stopped
     static void SoundStopped(const wxSoundData* data);
     // Notification when a sound has stopped
     static void SoundStopped(const wxSoundData* data);

-    
+

 protected:
     bool    DoPlay(unsigned flags) const;
     void    Init();
 protected:
     bool    DoPlay(unsigned flags) const;
     void    Init();


@@ -75,7 +75,7 @@ protected:
 private:
     // data of this object
     class wxSoundData *m_data;
 private:
     // data of this object
     class wxSoundData *m_data;

-    
+

     wxDECLARE_NO_COPY_CLASS(wxSound);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxSound);
 };