Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h
index f420f9485c17027762dd235643f599e2c11bd05d..76efeae3dc80a95d82f18730aecd6ef93e3b2c48 100644 (file)
--- a/include/wx/unix/sound.h
+++ b/include/wx/unix/sound.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Vaclav Slavik
 // Modified by:
 // Created:     25/10/98
 // Author:      Julian Smart, Vaclav Slavik
 // Modified by:
 // Created:     25/10/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -22,9 +21,9 @@
 // wxSound: simple audio playback class
 // ----------------------------------------------------------------------------
 
 // wxSound: simple audio playback class
 // ----------------------------------------------------------------------------
 

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

 
 /// Sound data, as loaded from .wav file:
 class WXDLLIMPEXP_ADV wxSoundData
 
 /// Sound data, as loaded from .wav file:
 class WXDLLIMPEXP_ADV wxSoundData


@@ -60,13 +59,13 @@ class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
 public:
     wxSound();
     wxSound(const wxString& fileName, bool isResource = false);
 public:
     wxSound();
     wxSound(const wxString& fileName, bool isResource = false);

-    wxSound(int size, const wxByte* data);
+    wxSound(size_t size, const void* data);

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

-    bool Create(int size, const wxByte* data);
+    bool Create(size_t size, const void* data);

 
     bool IsOk() const { return m_data != NULL; }
 
 
     bool IsOk() const { return m_data != NULL; }
 


@@ -84,7 +83,7 @@ protected:
 
     static void EnsureBackend();
     void Free();
 
     static void EnsureBackend();
     void Free();

-    bool LoadWAV(const wxUint8 *data, size_t length, bool copyData);
+    bool LoadWAV(const void* data, size_t length, bool copyData);

 
     static wxSoundBackend *ms_backend;
 #if wxUSE_LIBSDL && wxUSE_PLUGINS
 
     static wxSoundBackend *ms_backend;
 #if wxUSE_LIBSDL && wxUSE_PLUGINS