compilation fix for gcc (closes bug 996701)

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

diff --git a/include/wx/wave.h b/include/wx/wave.h
index e9aaa5a8883fc57f60a96142d74b8c4953b4abbc..a1fa38c705f3fc36d056a870862870b16973a912 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -1,17 +1,36 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/wave.h
+// Purpose:     wxSound compatibility header
+// Author:      Vaclav Slavik
+// Modified by:
+// Created:     2004/02/01
+// RCS-ID:      $Id$
+// Copyright:   (c) 2004, Vaclav Slavik
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_WAVE_H_BASE_
 #define _WX_WAVE_H_BASE_
 
-#if defined(__WXMSW__)
-#include "wx/msw/wave.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/wave.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/wave.h"
-#elif defined(__WXPM__)
-#include "wx/os2/wave.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/wave.h"
+#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
-    // _WX_TREECTRL_H_BASE_