From f53b1c1e6f5546e9916debbf5f93c652edca0ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 22 Jul 2004 07:49:29 +0000 Subject: [PATCH] removed enum that was causing more problems than it was worth git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/sound.h | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) 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