don't skip the scroll position validity check in CalcScrollInc() if m_[xy]ScrollPixel...

[wxWidgets.git] / src / unix / sound.cpp

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 997873bf90f255bfdca04a7995586a2135e5e801..0afab5a47be20af4ea990f0dc8ad1a8f6ab5179c 100644 (file)
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -13,7 +13,7 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SOUND
 #endif
 
 #if wxUSE_SOUND


@@ -31,11 +31,11 @@
     #include "wx/event.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/module.h"

 #endif
 
 #include "wx/thread.h"
 #include "wx/file.h"
 #endif
 
 #include "wx/thread.h"
 #include "wx/file.h"

-#include "wx/module.h"

 #include "wx/sound.h"
 #include "wx/dynlib.h"
 
 #include "wx/sound.h"
 #include "wx/dynlib.h"
 


@@ -296,7 +296,7 @@ class wxSoundSyncOnlyAdaptor : public wxSoundBackend
 public:
     wxSoundSyncOnlyAdaptor(wxSoundBackend *backend)
         : m_backend(backend), m_playing(false) {}
 public:
     wxSoundSyncOnlyAdaptor(wxSoundBackend *backend)
         : m_backend(backend), m_playing(false) {}

-    ~wxSoundSyncOnlyAdaptor()
+    virtual ~wxSoundSyncOnlyAdaptor()

     {
         delete m_backend;
     }
     {
         delete m_backend;
     }


@@ -640,7 +640,7 @@ bool wxSound::LoadWAV(const wxUint8 *data, size_t length, bool copyData)
     //      28  average bytes per second    |
     //      32  bytes per frame             |
     //      34  bits per sample             |
     //      28  average bytes per second    |
     //      32  bytes per frame             |
     //      34  bits per sample             |

-    //  
+    //

     //      36  "data"
     //      40  number of data bytes
     //      44  (wave signal) data
     //      36  "data"
     //      40  number of data bytes
     //      44  (wave signal) data