X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9905656a35761f368f6775f6f8d50ca393c63088..4aae4a085cf105551590b2a999758e0762743352:/include/wx/sound.h?ds=sidebyside diff --git a/include/wx/sound.h b/include/wx/sound.h index 9f7b7b849e..1da13bffe8 100644 --- a/include/wx/sound.h +++ b/include/wx/sound.h @@ -27,26 +27,16 @@ // ---------------------------------------------------------------------------- // Flags for wxSound::Play -#if WXWIN_COMPATIBILITY_2_4 || \ - defined(__BORLANDC__) || \ - defined(__VISUALC__) || \ - defined(__DMC__) - // NB: We can't use enum because there would be ambiguity between the - // two Play() prototypes when called without explicit parameters. - // We can't use enum with some compilers either, 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) -#else - enum wxSoundFlags - { - wxSOUND_SYNC = 0, - wxSOUND_ASYNC = 1, - wxSOUND_LOOP = 2 - }; -#endif + +// 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). +#define wxSOUND_SYNC ((unsigned)0) +#define wxSOUND_ASYNC ((unsigned)1) +#define wxSOUND_LOOP ((unsigned)2) // Base class for wxSound implementations class WXDLLIMPEXP_ADV wxSoundBase : public wxObject