Don't try to typedef off_t twice (eVC++)

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

diff --git a/include/wx/wave.h b/include/wx/wave.h
index 582841f7e952ee16b0971b296e01676b0e8992d8..97f330077477a14b38eeeeea2b934e1e6136c7b2 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -6,7 +6,7 @@
 // Created:     2004/02/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Vaclav Slavik
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WAVE_H_BASE_
@@ -14,11 +14,23 @@
 
 #include "wx/setup.h"
 
+#if wxUSE_SOUND
+
 #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"
+#endif
     #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
+
+#endif