X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..acc0ebd7a871124d4d6b36069340227e6c584f38:/src/msw/wave.cpp

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index 699b92ebee..52e5ebfe56 100644
--- a/src/msw/wave.cpp
+++ b/src/msw/wave.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_WAVE
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -31,16 +33,10 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#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
+#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
+    #include "wx/msw/gnuwin32/extra.h"
+#else
+    #include <mmsystem.h>
 #endif
 
 wxWave::wxWave()
@@ -76,12 +72,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;
@@ -171,4 +167,4 @@ bool wxWave::Free()
   return FALSE;
 }
 
-
+#endif // wxUSE_WAVE