Fixed initialisation order warning

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

diff --git a/include/wx/sound.h b/include/wx/sound.h
index 1da13bffe8dad0e466cc24aed6747bc449da46dd..37315eb8a37410248f46394b8ee15640149d83a7 100644 (file)
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -6,16 +6,12 @@
 // Created:     2004/02/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Vaclav Slavik
 // Created:     2004/02/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004, Vaclav Slavik

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_BASE_
 #define _WX_SOUND_H_BASE_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_BASE_
 #define _WX_SOUND_H_BASE_
 

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

 #include "wx/defs.h"
 
 #if wxUSE_SOUND
 #include "wx/defs.h"
 
 #if wxUSE_SOUND


@@ -27,7 +23,7 @@
 // ----------------------------------------------------------------------------
 
 // Flags for wxSound::Play
 // ----------------------------------------------------------------------------
 
 // Flags for wxSound::Play

-    
+

 // NB: We can't use enum because there would be ambiguity between the
 //     two Play() prototypes when called without explicit parameters
 //     if WXWIN_COMPATIBILITY_2_4.
 // NB: We can't use enum because there would be ambiguity between the
 //     two Play() prototypes when called without explicit parameters
 //     if WXWIN_COMPATIBILITY_2_4.


@@ -56,7 +52,7 @@ public:
 
     // Plays sound from filename:
     static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC);
 
     // Plays sound from filename:
     static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC);

-    
+

 protected:
     virtual bool DoPlay(unsigned flags) const = 0;
 };
 protected:
     virtual bool DoPlay(unsigned flags) const = 0;
 };


@@ -67,6 +63,8 @@ protected:
 
 #if defined(__WXMSW__)
     #include "wx/msw/sound.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/sound.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/sound.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/sound.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/sound.h"
 #elif defined(__WXPM__)