define wxUSE_UNICODE_MSLU as 0 unconditionally, CE doesn't support nor need MSLU

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

diff --git a/include/wx/wave.h b/include/wx/wave.h
index 582841f7e952ee16b0971b296e01676b0e8992d8..2372a6d9b86da5b0186eed639a4077e44b3ed8df 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -6,19 +6,31 @@
 // Created:     2004/02/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Vaclav Slavik
 // Created:     2004/02/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Vaclav Slavik

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_BASE_
 #define _WX_WAVE_H_BASE_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_BASE_
 #define _WX_WAVE_H_BASE_
 

-#include "wx/setup.h"
+#include "wx/defs.h"
+
+#if wxUSE_SOUND

 
 #if WXWIN_COMPATIBILITY_2_4
 
 #if WXWIN_COMPATIBILITY_2_4

+#if defined(__DMC__) || defined(__BORLANDC__)
+    #pragma message "wx/wave.h header is deprecated, use wx/sound.h and wxSound"
+#elif defined(__WATCOMC__) || defined(__VISUALC__)
+    #pragma message ("wx/wave.h header is deprecated, use wx/sound.h and wxSound")
+#else

     #warning "wx/wave.h header is deprecated, use wx/sound.h and wxSound"
     #warning "wx/wave.h header is deprecated, use wx/sound.h and wxSound"

+#endif

     #include "wx/sound.h"
     #include "wx/sound.h"

+    // wxSound used to be called wxWave before wxWidgets 2.5.1:
+    typedef wxSound wxWave;

 #else
     #error "wx/wave.h is only available in compatibility mode"
 #endif
 
 #endif
 #else
     #error "wx/wave.h is only available in compatibility mode"
 #endif
 
 #endif

+
+#endif