Crude hack to enable PageUp/DownKeys when controlbar is enabled.

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

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index 805a64fa0ea5455566b1111656896f4007b6a754..df4b95ee7440ad0a15929ef79c1c6f281ed1a152 100644 (file)
--- a/src/msw/wave.cpp
+++ b/src/msw/wave.cpp
@@ -73,9 +73,13 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
 
     HRSRC hresInfo;
 #if defined(__WIN32__) && !defined(__TWIN32__)
 
     HRSRC hresInfo;
 #if defined(__WIN32__) && !defined(__TWIN32__)

-    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, "WAVE");
+#ifdef _UNICODE
+    hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, _T("WAVE"));

 #else
 #else

-    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, "WAVE");
+    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, _T("WAVE"));
+#endif
+#else
+    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, _T("WAVE"));

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


@@ -129,7 +133,7 @@ bool wxWave::Play(bool async, bool looped) const
     return FALSE;
 
 #ifdef __WIN32__
     return FALSE;
 
 #ifdef __WIN32__

-  return ( ::PlaySound((LPCSTR)m_waveData, NULL, SND_MEMORY |
+  return ( ::PlaySound((LPCTSTR)m_waveData, NULL, SND_MEMORY |

     SND_NODEFAULT | (async ? SND_ASYNC : SND_SYNC) | (looped ? (SND_LOOP | SND_ASYNC) : 0)) != 0 );
 #else
   return ( ::sndPlaySound((LPCSTR)m_waveData, SND_MEMORY |
     SND_NODEFAULT | (async ? SND_ASYNC : SND_SYNC) | (looped ? (SND_LOOP | SND_ASYNC) : 0)) != 0 );
 #else
   return ( ::sndPlaySound((LPCSTR)m_waveData, SND_MEMORY |