Fix for wxToolbook, allow oldSel == wxNOT_FOUND when changing to a

[wxWidgets.git] / include / wx / unix / sound.h

diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h
index 6b0050ffdb64cb1e73d9875e5f8246dc08bb5405..9e6fa7501a16ecc534f653979643b9177ab1423f 100644 (file)
--- a/include/wx/unix/sound.h
+++ b/include/wx/unix/sound.h
@@ -16,22 +16,18 @@
 
 #if wxUSE_SOUND
 
 
 #if wxUSE_SOUND
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sound.h"
-#endif
-

 #include "wx/object.h"
 
 // ----------------------------------------------------------------------------
 // wxSound: simple audio playback class
 // ----------------------------------------------------------------------------
 
 #include "wx/object.h"
 
 // ----------------------------------------------------------------------------
 // wxSound: simple audio playback class
 // ----------------------------------------------------------------------------
 

-class wxSoundBackend;
-class wxSound;
-class wxDynamicLibrary;
+class WXDLLIMPEXP_ADV wxSoundBackend;
+class WXDLLIMPEXP_ADV wxSound;
+class WXDLLIMPEXP_BASE wxDynamicLibrary;

 
 /// Sound data, as loaded from .wav file:
 
 /// Sound data, as loaded from .wav file:

-class wxSoundData
+class WXDLLIMPEXP_ADV wxSoundData

 {
 public:
     wxSoundData() : m_refCnt(1) {}
 {
 public:
     wxSoundData() : m_refCnt(1) {}


@@ -59,13 +55,13 @@ private:
 
 
 /// Simple sound class:
 
 
 /// Simple sound class:

-class wxSound : public wxSoundBase
+class WXDLLIMPEXP_ADV wxSound : public wxSoundBase

 {
 public:
     wxSound();
     wxSound(const wxString& fileName, bool isResource = false);
     wxSound(int size, const wxByte* data);
 {
 public:
     wxSound();
     wxSound(const wxString& fileName, bool isResource = false);
     wxSound(int size, const wxByte* data);

-    ~wxSound();
+    virtual ~wxSound();

 
     // Create from resource or file
     bool Create(const wxString& fileName, bool isResource = false);
 
     // Create from resource or file
     bool Create(const wxString& fileName, bool isResource = false);


@@ -121,7 +117,7 @@ struct wxSoundPlaybackStatus
 };
 
 // Audio backend interface
 };
 
 // Audio backend interface

-class wxSoundBackend
+class WXDLLIMPEXP_ADV wxSoundBackend

 {
 public:
     virtual ~wxSoundBackend() {}
 {
 public:
     virtual ~wxSoundBackend() {}