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
This commit is contained in:
parent
a87bf37838
commit
f53b1c1e6f
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user