deprecated wxBookCtrlSizer and wxNotebookSizer, they are no longer needed

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

diff --git a/include/wx/sound.h b/include/wx/sound.h
index 0ceba3624000fe040343020b8dc82cd3d13962d8..f450bcc6bd6b3a0746b675aed1ea4635c880ba7d 100644 (file)
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -27,9 +27,12 @@
 // ----------------------------------------------------------------------------
 
 // Flags for wxSound::Play
 // ----------------------------------------------------------------------------
 
 // 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)
     #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"
 
 #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(__WXMAC__)
     #include "wx/mac/sound.h"
 #elif defined(__WXPM__)
     #include "wx/os2/sound.h"

+#elif defined(__UNIX__)
+    #include "wx/unix/sound.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------