new VC++ project files with both dll and lib in one project

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

diff --git a/src/os2/wave.cpp b/src/os2/wave.cpp
index ed70fafdb8e016514c76ad3a5fa4373fb4b1b928..87320e0d63e56279c82a77d7467967a4f71685cf 100644 (file)
--- a/src/os2/wave.cpp
+++ b/src/os2/wave.cpp
@@ -18,13 +18,18 @@
 
 #include "wx/file.h"
 #include "wx/os2/wave.h"
 
 #include "wx/file.h"
 #include "wx/os2/wave.h"

-#include "wx/os2/private.h"
-
-#ifdef RECT
-    #undef RECT
-#endif
-#include <mmio.h>
-#include <mmsystem.h>
+#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>
+#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)
 
 wxWave::wxWave()
   : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)


@@ -81,6 +86,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
   else
   {
     m_isResource = FALSE;
   else
   {
     m_isResource = FALSE;

+#if wxUSE_FILE

 
     wxFile fileWave;
     if (!fileWave.Open(fileName, wxFile::read))
 
     wxFile fileWave;
     if (!fileWave.Open(fileName, wxFile::read))


@@ -96,6 +102,9 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
     fileWave.Read(m_waveData, m_waveLength);
 */
     return TRUE;
     fileWave.Read(m_waveData, m_waveLength);
 */
     return TRUE;

+#else
+    return FALSE;
+#endif //wxUSE_FILE

   }
 }
 
   }
 }