pointer returned by GetNativeFontInfo() is now const and must not be deleted (replace...

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

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index abb89060fb8218e7546aa493b61f37feae793cfa..1ee00838013efec4370f61454c6e359afc0ab041 100644 (file)
--- a/src/msw/wave.cpp
+++ b/src/msw/wave.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "wave.h"
 #endif
 
@@ -30,7 +30,6 @@
 #include "wx/msw/wave.h"
 #include "wx/msw/private.h"
 
-#include <windows.h>
 #include <windowsx.h>
 
 #if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
@@ -70,7 +69,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
     m_isResource = TRUE;
 
     HRSRC hresInfo;
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
 #ifdef _UNICODE
     hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, wxT("WAVE"));
 #else
@@ -102,7 +101,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
 
     m_waveLength = (int) fileWave.Length();
 
-    m_waveData = (wxByte*)::GlobalLock(::GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength));
+    m_waveData = (wxByte*)GlobalLock(GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength));
     if (!m_waveData)
         return FALSE;
 
@@ -117,7 +116,7 @@ bool wxWave::Create(int size, const wxByte* data)
   Free();
   m_isResource = FALSE;
   m_waveLength=size;
-  m_waveData = (wxByte*)::GlobalLock(::GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength));
+  m_waveData = (wxByte*)GlobalLock(GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength));
   if (!m_waveData)
      return FALSE;
 
@@ -143,20 +142,24 @@ bool wxWave::Free()
 {
   if (m_waveData)
   {
-#ifdef __WIN32__
-    HGLOBAL waveData = ::GlobalHandle(m_waveData);
+#ifdef __WXWINCE__
+    HGLOBAL waveData = (HGLOBAL) m_waveData;
+#elif defined(__WIN32__)
+    HGLOBAL waveData = GlobalHandle(m_waveData);
 #else
     HGLOBAL waveData = GlobalPtrHandle(m_waveData);
 #endif
 
     if (waveData)
     {
-      if (m_isResource)
+#ifndef __WXWINCE__
+        if (m_isResource)
         ::FreeResource(waveData);
       else
+#endif
       {
-        ::GlobalUnlock(waveData);
-        ::GlobalFree(waveData);
+        GlobalUnlock(waveData);
+        GlobalFree(waveData);
       }
 
       m_waveData = NULL;