X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85c9f98b509e8a7870a99fb580775f6fda4cf38e..bf2c43c76e2819be443ab1d830ab68d9569d66b1:/src/cocoa/sound.mm diff --git a/src/cocoa/sound.mm b/src/cocoa/sound.mm index dbafe8f5f6..0b3a0530a3 100644 --- a/src/cocoa/sound.mm +++ b/src/cocoa/sound.mm @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sound.cpp +// Name: src/cocoa/sound.mm // Purpose: wxSound class implementation: optional // Authors: David Elliott, Ryan Norton // Modified by: // Created: 2004-10-02 -// RCS-ID: $Id$ // Copyright: (c) 2004 David Elliott, Ryan Norton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,6 +22,8 @@ #include "wx/cocoa/string.h" #include "wx/cocoa/log.h" +#include "wx/cocoa/objc/objc_uniquifying.h" + #import #import @@ -39,6 +40,7 @@ static bool s_loopCurrentSound = false; // Delegate methods - (void)sound:(NSSound *)theSound didFinishPlaying:(BOOL)finishedPlaying; @end // interface wxNSSoundDelegate : NSObject +WX_DECLARE_GET_OBJC_CLASS(wxNSSoundDelegate,NSObject) @implementation wxNSSoundDelegate : NSObject @@ -66,8 +68,9 @@ static bool s_loopCurrentSound = false; } @end // wxNSSoundDelegate +WX_IMPLEMENT_GET_OBJC_CLASS(wxNSSoundDelegate,NSObject) -const wxObjcAutoRefFromAlloc wxSound::sm_cocoaDelegate = [[wxNSSoundDelegate alloc] init]; +const wxObjcAutoRefFromAlloc wxSound::sm_cocoaDelegate = [[WX_GET_OBJC_CLASS(wxNSSoundDelegate) alloc] init]; // ------------------------------------------------------------------ // wxSound @@ -161,7 +164,7 @@ bool wxSound::DoPlay(unsigned flags) const bool wxSound::IsPlaying() { // Normally you can send a message to a nil object and it will return - // nil. That behavior would probably be okay here but in general it's + // nil. That behaviour would probably be okay here but in general it's // not recommended to send a message to a nil object if the return // value is not an object. Better safe than sorry. if(s_currentSound)