applied patch for compilation with gcc 3.0

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

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index 699b92ebee6c15989b160643600c4c4dbf208014..675d15c9aeb6b96afbd757dd69de5e433dcc4084 100644 (file)
--- 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -31,16 +31,10 @@
 #include <windows.h>
 #include <windowsx.h>
 
 #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
+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"
+#else
+    #include <mmsystem.h>

 #endif
 
 wxWave::wxWave()
 #endif
 
 wxWave::wxWave()


@@ -76,12 +70,12 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
     HRSRC hresInfo;
 #if defined(__WIN32__) && !defined(__TWIN32__)
 #ifdef _UNICODE
     HRSRC hresInfo;
 #if defined(__WIN32__) && !defined(__TWIN32__)
 #ifdef _UNICODE

-    hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, T("WAVE"));
+    hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, wxT("WAVE"));

 #else
 #else

-    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, T("WAVE"));
+    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, wxT("WAVE"));

 #endif
 #else
 #endif
 #else

-    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, T("WAVE"));
+    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, wxT("WAVE"));

 #endif
     if (!hresInfo)
         return FALSE;
 #endif
     if (!hresInfo)
         return FALSE;