Return NULL from wxWindow::GetCapture() when the capture is being lost.

[wxWidgets.git] / src / cocoa / sound.mm

diff --git a/src/cocoa/sound.mm b/src/cocoa/sound.mm
index dbafe8f5f6eb114de31aa5347cd2d69165b766f9..0b3a0530a3c4d4cac6cfd309fea946295dad7c35 100644 (file)
--- 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // 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/string.h"
 #include "wx/cocoa/log.h"
 

+#include "wx/cocoa/objc/objc_uniquifying.h"
+

 #import <AppKit/NSSound.h>
 #import <Foundation/NSData.h>
 
 #import <AppKit/NSSound.h>
 #import <Foundation/NSData.h>
 


@@ -39,6 +40,7 @@ static bool s_loopCurrentSound = false;
 // Delegate methods
 - (void)sound:(NSSound *)theSound didFinishPlaying:(BOOL)finishedPlaying;
 @end // interface wxNSSoundDelegate : NSObject
 // Delegate methods
 - (void)sound:(NSSound *)theSound didFinishPlaying:(BOOL)finishedPlaying;
 @end // interface wxNSSoundDelegate : NSObject

+WX_DECLARE_GET_OBJC_CLASS(wxNSSoundDelegate,NSObject)

 
 @implementation wxNSSoundDelegate : NSObject
 
 
 @implementation wxNSSoundDelegate : NSObject
 


@@ -66,8 +68,9 @@ static bool s_loopCurrentSound = false;
 }
 
 @end // wxNSSoundDelegate
 }
 
 @end // wxNSSoundDelegate

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSSoundDelegate,NSObject)

 
 

-const wxObjcAutoRefFromAlloc<struct objc_object*> wxSound::sm_cocoaDelegate = [[wxNSSoundDelegate alloc] init];
+const wxObjcAutoRefFromAlloc<struct objc_object*> wxSound::sm_cocoaDelegate = [[WX_GET_OBJC_CLASS(wxNSSoundDelegate) alloc] init];

 
 // ------------------------------------------------------------------
 //          wxSound
 
 // ------------------------------------------------------------------
 //          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
 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)
     // 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)