X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65fd5cb0124e62ab1fc41f93382a205d95b00e75..0460407f86c7107ff3548afbd846aa8dfd44cc20:/src/msw/wave.cpp diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp index 19b164f5a0..675d15c9ae 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__ @@ -31,16 +31,10 @@ #include #include -#if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS) -#include -#endif - -#ifndef __TWIN32__ -#ifdef __GNUWIN32__ -#ifndef wxUSE_NORLANDER_HEADERS -#include "wx/msw/gnuwin32/extra.h" -#endif -#endif +#ifdef __GNUWIN32_OLD__ + #include "wx/msw/gnuwin32/extra.h" +#else + #include #endif wxWave::wxWave() @@ -76,12 +70,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;