Add wxDataViewRendererBase::GetEffectiveAlignment() and use it.

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

diff --git a/include/wx/sound.h b/include/wx/sound.h
index f450bcc6bd6b3a0746b675aed1ea4635c880ba7d..b81a11cb46b48b06bb1a6678964c58342f936403 100644 (file)
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -4,18 +4,13 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // 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_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "soundbase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_SOUND
@@ -27,23 +22,13 @@
 // ----------------------------------------------------------------------------
 
 // Flags for wxSound::Play
-#if WXWIN_COMPATIBILITY_2_4 || defined(__BORLANDC__)
-    // NB: We can't use enum because there would be ambiguity between the
-    //     two Play() prototypes when called without explicit parameters.
-    //     We can't use enum with Borland's compiler either, because it's
-    //     broken and keeps 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)
-#else
-    enum wxSoundFlags
-    {
-        wxSOUND_SYNC   = 0,
-        wxSOUND_ASYNC  = 1,
-        wxSOUND_LOOP   = 2
-    };
-#endif
+
+// NB: We can't use enum with some compilers, 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
@@ -54,16 +39,13 @@ public:
     {
         wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 ||
                       (flags & wxSOUND_ASYNC) != 0,
-                     _T("sound can only be looped asynchronously") );
+                     wxT("sound can only be looped asynchronously") );
         return DoPlay(flags);
     }
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( bool Play(bool async, bool looped = false) const );
-#endif
 
     // Plays sound from filename:
     static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC);
-    
+
 protected:
     virtual bool DoPlay(unsigned flags) const = 0;
 };
@@ -72,10 +54,12 @@ protected:
 // wxSound class implementation
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     #include "wx/msw/sound.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/sound.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/sound.h"
+    #include "wx/osx/sound.h"
 #elif defined(__WXPM__)
     #include "wx/os2/sound.h"
 #elif defined(__UNIX__)
@@ -92,16 +76,6 @@ inline bool wxSoundBase::Play(const wxString& filename, unsigned flags)
     return snd.IsOk() ? snd.Play(flags) : false;
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-inline bool wxSoundBase::Play(bool async, bool looped) const
-{
-    unsigned flags = 0;
-    if (async) flags |= wxSOUND_ASYNC;
-    if (looped) flags |= wxSOUND_LOOP | wxSOUND_ASYNC;
-    return DoPlay(flags);
-}
-#endif
-
 #endif // wxUSE_SOUND
 
 #endif // _WX_SOUND_H_BASE_