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

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

diff --git a/include/wx/cocoa/sound.h b/include/wx/cocoa/sound.h
index d764e8bfeade9ea721b5b6d1caa7b7088dea5bc4..362e2e288dd0e91b1209dc7ee06cdab343d47e8d 100644 (file)
--- a/include/wx/cocoa/sound.h
+++ b/include/wx/cocoa/sound.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sound.h
+// Name:        wx/cocoa/sound.h

 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Authors:     David Elliott, Ryan Norton
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Authors:     David Elliott, Ryan Norton

-// Modified by: 
+// Modified by:

 // Created:     2004-10-02
 // Created:     2004-10-02

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 David Elliott, Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004 David Elliott, Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,7 +15,7 @@
 #include "wx/object.h"
 #include "wx/cocoa/ObjcRef.h"
 
 #include "wx/object.h"
 #include "wx/cocoa/ObjcRef.h"
 

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

 {
 public:
     wxSound()
 {
 public:
     wxSound()


@@ -25,7 +24,7 @@ public:
     wxSound(const wxString& fileName, bool isResource = false)
     :   m_cocoaNSSound(NULL)
     {   Create(fileName, isResource); }
     wxSound(const wxString& fileName, bool isResource = false)
     :   m_cocoaNSSound(NULL)
     {   Create(fileName, isResource); }

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

     :   m_cocoaNSSound(NULL)
     {   LoadWAV(data,size,true); }
     wxSound(const wxSound& sound); // why not?
     :   m_cocoaNSSound(NULL)
     {   LoadWAV(data,size,true); }
     wxSound(const wxSound& sound); // why not?


@@ -41,9 +40,9 @@ public:
     void SetNSSound(WX_NSSound cocoaNSSound);
     inline WX_NSSound GetNSSound()
     {   return m_cocoaNSSound; }
     void SetNSSound(WX_NSSound cocoaNSSound);
     inline WX_NSSound GetNSSound()
     {   return m_cocoaNSSound; }

-protected:  
+protected:

     bool DoPlay(unsigned flags) const;
     bool DoPlay(unsigned flags) const;

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

 private:
     WX_NSSound m_cocoaNSSound;
     static const wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaDelegate;
 private:
     WX_NSSound m_cocoaNSSound;
     static const wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaDelegate;