X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f8b1df0b15f843b8f47efb9bee38f1de0fa95020:/include/wx/sound.h

diff --git a/include/wx/sound.h b/include/wx/sound.h
index 37315eb8a3..a0c780488f 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)
@@ -46,9 +43,6 @@ public:
                      _T("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);
@@ -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_