Remove wxRTTI macro for wxComboBox from Motif port.

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

diff --git a/include/wx/cocoa/sound.h b/include/wx/cocoa/sound.h
index 1a6f7de02de32d668c94c1ce7739b6b722bc29f2..75ded5c136d7061f28def65ada26332a230bba24 100644 (file)
--- a/include/wx/cocoa/sound.h
+++ b/include/wx/cocoa/sound.h
@@ -25,7 +25,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?


@@ -43,7 +43,7 @@ public:
     {   return m_cocoaNSSound; }
 protected:
     bool DoPlay(unsigned flags) const;
     {   return m_cocoaNSSound; }
 protected:
     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;