X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65cf3a4b6a3f70a40db688f75e27d8e7457618d3..f325fa52deb739f64536962b97e5db8eec9ee1c7:/include/wx/sound.h?ds=inline diff --git a/include/wx/sound.h b/include/wx/sound.h index 0ceba36240..f450bcc6bd 100644 --- a/include/wx/sound.h +++ b/include/wx/sound.h @@ -27,9 +27,12 @@ // ---------------------------------------------------------------------------- // Flags for wxSound::Play -#if WXWIN_COMPATIBILITY_2_4 - // 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 || defined(__BORLANDC__) + // 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 Borland's compiler either, because it's + // broken and keeps 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) @@ -71,12 +74,12 @@ protected: #if defined(__WXMSW__) #include "wx/msw/sound.h" -#elif defined(__UNIX__) - #include "wx/unix/sound.h" #elif defined(__WXMAC__) #include "wx/mac/sound.h" #elif defined(__WXPM__) #include "wx/os2/sound.h" +#elif defined(__UNIX__) + #include "wx/unix/sound.h" #endif // ----------------------------------------------------------------------------