going private for m_peer to give a foundation for better encapsulation

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

diff --git a/include/wx/sound.h b/include/wx/sound.h
index 6550c0834f596ab9d5e5cfcd05de68d154a34854..ef473443f748b695a00ec6c689f1bf93e746409b 100644 (file)
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -24,12 +24,9 @@
 
 // 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.
-//     We can't use enum with some compilers either, because they
-//     keep reporting nonexistent ambiguities between
-//     Play(unsigned) and static Play(const wxString&, unsigned).
+// 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)
 #define wxSOUND_SYNC  ((unsigned)0)
 #define wxSOUND_ASYNC ((unsigned)1)
 #define wxSOUND_LOOP  ((unsigned)2)


@@ -43,7 +40,7 @@ public:
     {
         wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 ||
                       (flags & wxSOUND_ASYNC) != 0,
     {
         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);
     }
 
         return DoPlay(flags);
     }
 


@@ -63,7 +60,7 @@ protected:
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/sound.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXPM__)
     #include "wx/os2/sound.h"
 #elif defined(__UNIX__)