Corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/mmedia/sndwin.h b/contrib/include/wx/mmedia/sndwin.h
index fed5126066bd58f6f6556cca9a8f95bb1e68cf51..e630ee4543977dc65577b8c00545581f37d046d0 100644 (file)
--- a/contrib/include/wx/mmedia/sndwin.h
+++ b/contrib/include/wx/mmedia/sndwin.h
@@ -14,7 +14,7 @@
 typedef struct _wxSoundInternal wxSoundInternal;
 typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
 
 typedef struct _wxSoundInternal wxSoundInternal;
 typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
 

-class wxSoundInternal;
+// class WXDLLEXPORT wxSoundInternal;

 class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream {
  public:
   wxSoundStreamWin();
 class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream {
  public:
   wxSoundStreamWin();

diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
index 8e9c73ff8169e409319825c943e13b91b87b861d..2ef21554eeff047b98fc0a1f529e9d77e20a4129 100644 (file)
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@@ -10,10 +10,10 @@
 #endif
 
 #include <wx/wxprec.h>
 #endif
 
 #include <wx/wxprec.h>

-#include "sndbase.h"
-#include "sndfile.h"
-#include "sndpcm.h"
-#include "sndmsad.h"
+#include "wx/mmedia/sndbase.h"
+#include "wx/mmedia/sndfile.h"
+#include "wx/mmedia/sndpcm.h"
+#include "wx/mmedia/sndmsad.h"

 
 // --------------------------------------------------------------------------
 // wxSoundFormatMSAdpcm
 
 // --------------------------------------------------------------------------
 // wxSoundFormatMSAdpcm

diff --git a/contrib/src/mmedia/sndwin.cpp b/contrib/src/mmedia/sndwin.cpp
index c2776d9438ecc32da60502496d7cf4cef55c02e7..185f1bfb5eef7c49645ac74d37d275299727ea4b 100644 (file)
--- a/contrib/src/mmedia/sndwin.cpp
+++ b/contrib/src/mmedia/sndwin.cpp
@@ -16,11 +16,12 @@
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/app.h"

-    #include "wx/module.h"
-    #include "wx/msw/private.h"

     #include "wx/string.h"
 #endif
 
     #include "wx/string.h"
 #endif
 

+#include "wx/module.h"
+#include "wx/msw/private.h"
+

 // -------------------------------------------------------------------------
 // MMedia headers
 // -------------------------------------------------------------------------
 // -------------------------------------------------------------------------
 // MMedia headers
 // -------------------------------------------------------------------------


@@ -117,7 +118,13 @@ wxSoundStreamWin::~wxSoundStreamWin()
 // -----------------------------------------------------------------------
 // _wxSoundHandlerWndProc: Window callback to handle buffer completion
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
 // _wxSoundHandlerWndProc: Window callback to handle buffer completion
 // -----------------------------------------------------------------------

-LRESULT APIENTRY _EXPORT _wxSoundHandlerWndProc(HWND hWnd, UINT message,
+/*
+LRESULT APIENTRY _EXPORT
+*/
+
+LRESULT WXDLLEXPORT APIENTRY _EXPORT 
+
+ _wxSoundHandlerWndProc(HWND hWnd, UINT message,

                  WPARAM wParam, LPARAM lParam)
 {
   wxSoundStreamWin *sndwin;
                  WPARAM wParam, LPARAM lParam)
 {
   wxSoundStreamWin *sndwin;


@@ -307,7 +314,7 @@ wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
   info->m_h_header = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(WAVEHDR));
   if (!info->m_h_data || !info->m_h_header) {
     delete info;
   info->m_h_header = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(WAVEHDR));
   if (!info->m_h_data || !info->m_h_header) {
     delete info;

-    m_snderror = wxSOUND_MEMERR;
+    m_snderror = wxSOUND_MEMERROR;

     return NULL;
   }
 
     return NULL;
   }