Update headers and templates

wxheaders/wx/sound.h

@@ -57,7 +57,74 @@ protected:
 #if defined(__WINDOWS__)
     #include "wx/msw/sound.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/sound.h"
+#ifndef _WX_SOUND_H_
+#define _WX_SOUND_H_
+
+#if wxUSE_SOUND
+
+#include "wx/object.h"
+
+class WXDLLIMPEXP_FWD_CORE wxSoundTimer;
+
+class WXDLLIMPEXP_CORE wxSoundData
+{
+public :
+    wxSoundData();
+    virtual ~wxSoundData();
+
+    virtual bool Play(unsigned int flags) = 0;
+    // stops the sound and deletes the optional timer
+    virtual void Stop();
+    // 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:
+    unsigned int m_flags;
+    bool m_markedForDeletion;
+} ;
+
+class WXDLLIMPEXP_CORE wxSound : public wxSoundBase
+{
+public:
+    wxSound();
+    wxSound(const wxString& fileName, bool isResource = false);
+    wxSound(size_t size, const void* data);
+    virtual ~wxSound();
+
+    // Create from resource or file
+    bool  Create(const wxString& fileName, bool isResource = false);
+    // Create from data
+    bool Create(size_t size, const void* data);
+
+    bool IsOk() const { return m_data != NULL; }
+
+    // Stop playing any sound
+    static void Stop();
+
+    // Returns true if a sound is being played
+    static bool IsPlaying();
+
+    // Notification when a sound has stopped
+    static void SoundStopped(const wxSoundData* data);
+
+protected:
+    bool    DoPlay(unsigned flags) const wxOVERRIDE;
+    void    Init();
+
+private:
+    // data of this object
+    class wxSoundData *m_data;
+
+    wxDECLARE_NO_COPY_CLASS(wxSound);
+};
+
+#endif
+#endif
+    // _WX_SOUND_H_
 #elif defined(__UNIX__)
     #include "wx/unix/sound.h"
 #endif