NEED_GTK_ICON_SIZE_LOOKUP was incorrectly tested using #if instead of #ifdef

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

diff --git a/include/wx/wave.h b/include/wx/wave.h
index d766cc341ed02a0c25249628e30d176ee717f4ba..2372a6d9b86da5b0186eed639a4077e44b3ed8df 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -1,19 +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/unix/wave.h"
-#elif defined(__WXX11__)
-#include "wx/unix/wave.h"
-#elif defined(__WXMOTIF__)
-#include "wx/unix/wave.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/wave.h"
-#elif defined(__WXPM__)
-#include "wx/os2/wave.h"
+#include "wx/defs.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_