added adjustOrigin parameter to bounds calculation

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

diff --git a/include/wx/wave.h b/include/wx/wave.h
index 582841f7e952ee16b0971b296e01676b0e8992d8..45d5b8094422a110ddaf596e5d7c1dd2960f3e7f 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -14,11 +14,23 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.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 wxWindows 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