wxChoicebook generic implementation.

[wxWidgets.git] / include / wx / sound.h

diff --git a/include/wx/sound.h b/include/wx/sound.h
index 75806a53a31143815cb8ca55f580f9ba41df83f3..1da13bffe8dad0e466cc24aed6747bc449da46dd 100644 (file)
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -27,20 +27,16 @@
 // ----------------------------------------------------------------------------
 
 // 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
-    #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