Add missing WXK constants for the control keys

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

diff --git a/include/wx/msw/sound.h b/include/wx/msw/sound.h
index d0a69a5d15474d84ed01d488a87411e9d352babe..5be1eefc8fc29223708789143460935af5987995 100644 (file)
--- a/include/wx/msw/sound.h
+++ b/include/wx/msw/sound.h
@@ -12,10 +12,6 @@
 #ifndef _WX_SOUND_H_
 #define _WX_SOUND_H_
 
 #ifndef _WX_SOUND_H_
 #define _WX_SOUND_H_
 

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

 #if wxUSE_SOUND
 
 class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
 #if wxUSE_SOUND
 
 class WXDLLIMPEXP_ADV wxSound : public wxSoundBase


@@ -23,14 +19,14 @@ 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; }
 


@@ -47,7 +43,7 @@ private:
     // data of this object
     class wxSoundData *m_data;
 
     // data of this object
     class wxSoundData *m_data;
 

-    DECLARE_NO_COPY_CLASS(wxSound)
+    wxDECLARE_NO_COPY_CLASS(wxSound);

 };
 
 #endif // wxUSE_SOUND
 };
 
 #endif // wxUSE_SOUND