X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/sound.h diff --git a/include/wx/sound.h b/include/wx/sound.h index 37315eb8a3..d60d7f3d69 100644 --- a/include/wx/sound.h +++ b/include/wx/sound.h @@ -24,12 +24,9 @@ // Flags for wxSound::Play -// NB: We can't use enum because there would be ambiguity between the -// two Play() prototypes when called without explicit parameters -// if WXWIN_COMPATIBILITY_2_4. -// We can't use enum with some compilers either, because they -// keep reporting nonexistent ambiguities between -// Play(unsigned) and static Play(const wxString&, unsigned). +// NB: We can't use enum with some compilers, because they keep reporting +// nonexistent ambiguities between Play(unsigned) and static Play(const +// wxString&, unsigned). #define wxSOUND_SYNC ((unsigned)0) #define wxSOUND_ASYNC ((unsigned)1) #define wxSOUND_LOOP ((unsigned)2) @@ -43,12 +40,9 @@ public: { wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 || (flags & wxSOUND_ASYNC) != 0, - _T("sound can only be looped asynchronously") ); + wxT("sound can only be looped asynchronously") ); return DoPlay(flags); } -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( bool Play(bool async, bool looped = false) const ); -#endif // Plays sound from filename: static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC); @@ -61,12 +55,12 @@ protected: // wxSound class implementation // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/sound.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/sound.h" #elif defined(__WXMAC__) - #include "wx/mac/sound.h" + #include "wx/osx/sound.h" #elif defined(__WXPM__) #include "wx/os2/sound.h" #elif defined(__UNIX__) @@ -83,16 +77,6 @@ inline bool wxSoundBase::Play(const wxString& filename, unsigned flags) return snd.IsOk() ? snd.Play(flags) : false; } -#if WXWIN_COMPATIBILITY_2_4 -inline bool wxSoundBase::Play(bool async, bool looped) const -{ - unsigned flags = 0; - if (async) flags |= wxSOUND_ASYNC; - if (looped) flags |= wxSOUND_LOOP | wxSOUND_ASYNC; - return DoPlay(flags); -} -#endif - #endif // wxUSE_SOUND #endif // _WX_SOUND_H_BASE_