subclass all updown controls in notebooks, not just the first one

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

diff --git a/include/wx/sound.h b/include/wx/sound.h
index 0ceba3624000fe040343020b8dc82cd3d13962d8..db761054905692d485f327539e0b7ff5c4746743 100644 (file)
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -6,7 +6,7 @@
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_BASE_


@@ -27,20 +27,16 @@
 // ----------------------------------------------------------------------------
 
 // Flags for wxSound::Play
 // ----------------------------------------------------------------------------
 
 // Flags for wxSound::Play

-#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
-    #define wxSOUND_SYNC  ((unsigned)0)
-    #define wxSOUND_ASYNC ((unsigned)1)
-    #define wxSOUND_LOOP  ((unsigned)2)
-#else
-    enum wxSoundFlags
-    {
-        wxSOUND_SYNC   = 0,
-        wxSOUND_ASYNC  = 1,
-        wxSOUND_LOOP   = 2
-    };
-#endif
+
+// 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.
+//     We can't use enum with some compilers either, because they
+//     keep reporting nonexistent ambiguities between
+//     Play(unsigned) and static Play(const wxString&, unsigned).
+#define wxSOUND_SYNC  ((unsigned)0)
+#define wxSOUND_ASYNC ((unsigned)1)
+#define wxSOUND_LOOP  ((unsigned)2)

 
 // Base class for wxSound implementations
 class WXDLLIMPEXP_ADV wxSoundBase : public wxObject
 
 // Base class for wxSound implementations
 class WXDLLIMPEXP_ADV wxSoundBase : public wxObject


@@ -60,7 +56,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;
 };


@@ -71,12 +67,14 @@ protected:
 
 #if defined(__WXMSW__)
     #include "wx/msw/sound.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/sound.h"

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

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

+#elif defined(__UNIX__)
+    #include "wx/unix/sound.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------