wxUSE_RICHeDIT added

[wxWidgets.git] / src / msw / wave.cpp

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index df4b95ee7440ad0a15929ef79c1c6f281ed1a152..8f2edf9af5267b985a06b7a3dbda32d4b7aa6aa5 100644 (file)
--- a/src/msw/wave.cpp
+++ b/src/msw/wave.cpp
@@ -31,15 +31,17 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
 #include <mmsystem.h>
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 wxWave::wxWave()
   : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)
@@ -74,12 +76,12 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
     HRSRC hresInfo;
 #if defined(__WIN32__) && !defined(__TWIN32__)
 #ifdef _UNICODE
-    hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, _T("WAVE"));
+    hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, wxT("WAVE"));
 #else
-    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, _T("WAVE"));
+    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, wxT("WAVE"));
 #endif
 #else
-    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, _T("WAVE"));
+    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, wxT("WAVE"));
 #endif
     if (!hresInfo)
         return FALSE;