revert return type changes for gdi object pointers

[wxWidgets.git] / contrib / include / wx / mmedia / sndbase.h

diff --git a/contrib/include/wx/mmedia/sndbase.h b/contrib/include/wx/mmedia/sndbase.h
index 627464f4cf198da21aae2641082cc88e2810ed0a..02a33dabdf147d1b789d45fbfd8d4dd8dce4415e 100644 (file)
--- a/contrib/include/wx/mmedia/sndbase.h
+++ b/contrib/include/wx/mmedia/sndbase.h
@@ -9,10 +9,6 @@
 #ifndef _WX_SNDBASE_H
 #define _WX_SNDBASE_H
 
 #ifndef _WX_SNDBASE_H
 #define _WX_SNDBASE_H
 

-#ifdef __GNUG__
-#pragma interface "sndbase.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/mmedia/defs.h"
 
 #include "wx/defs.h"
 #include "wx/mmedia/defs.h"
 


@@ -45,8 +41,8 @@ typedef enum {
 
 // ---------------------
 // wxSoundError:
 
 // ---------------------
 // wxSoundError:

-//   - wxSOUND_NOERR: No error occured
-//   - wxSOUND_IOERR: an input/output error occured, it may concern either
+//   - wxSOUND_NOERR: No error occurred
+//   - wxSOUND_IOERR: an input/output error occurred, it may concern either

 //                    a driver or a file
 //   - wxSOUND_INVFRMT: the sound format passed to the function is invalid.
 //                      Generally, it means that you passed out of range values
 //                    a driver or a file
 //   - wxSOUND_INVFRMT: the sound format passed to the function is invalid.
 //                      Generally, it means that you passed out of range values


@@ -83,7 +79,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream;
 // ---------------------
 // wxSoundCallback(stream, evt, cdata): C callback for sound event.
 //    - stream: current wxSoundStream
 // ---------------------
 // wxSoundCallback(stream, evt, cdata): C callback for sound event.
 //    - stream: current wxSoundStream

-//    - evt: the sound event which has occured, it may be wxSOUND_INPUT,
+//    - evt: the sound event which has occurred, it may be wxSOUND_INPUT,

 //            wxSOUND_OUTPUT or wxSOUND_DUPLEX
 //    - cdata: User callback data
 // ---------------------
 //            wxSOUND_OUTPUT or wxSOUND_DUPLEX
 //    - cdata: User callback data
 // ---------------------