Correction to accelerator bug fix: add FVIRTKEY if ctrl, alt or shift

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

diff --git a/src/os2/wave.cpp b/src/os2/wave.cpp
index bf21d3730360aa89627ca46513b03491b9ecd662..87320e0d63e56279c82a77d7467967a4f71685cf 100644 (file)
--- a/src/os2/wave.cpp
+++ b/src/os2/wave.cpp
@@ -18,16 +18,18 @@
 
 #include "wx/file.h"
 #include "wx/os2/wave.h"
-#include "wx/os2/private.h"
-
-#define INCL_DOS
+#define INCL_32                         /* force 32 bit compile */
+#define INCL_GPIBITMAPS
+#define INCL_DOSFILEMGR
+#define INCL_WIN
+#define INCL_GPI
 #define INCL_PM
 #include <os2.h>
-#ifdef RECT
-    #undef RECT
-#endif
-#include <mmio.h>
-#include <mmsystem.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <os2medef.h>
+#include <mmioos2.h>
 
 wxWave::wxWave()
   : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)
@@ -84,6 +86,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
   else
   {
     m_isResource = FALSE;
+#if wxUSE_FILE
 
     wxFile fileWave;
     if (!fileWave.Open(fileName, wxFile::read))
@@ -99,6 +102,9 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
     fileWave.Read(m_waveData, m_waveLength);
 */
     return TRUE;
+#else
+    return FALSE;
+#endif //wxUSE_FILE
   }
 }