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

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

diff --git a/src/cocoa/mediactrl.mm b/src/cocoa/mediactrl.mm
index e6cc52cb9b14fcac2072ecf426181aef088ce13d..3e1a97a1d270664e35f1cfba2060776e6ae78c47 100644 (file)
--- a/src/cocoa/mediactrl.mm
+++ b/src/cocoa/mediactrl.mm
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/cocoa/mediactrl.cpp
+// Name:        src/cocoa/mediactrl.mm

 // Purpose:     Built-in Media Backends for Cocoa
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     02/03/05
 // Purpose:     Built-in Media Backends for Cocoa
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     02/03/05

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004-2005 Ryan Norton, (c) 2005 David Elliot
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004-2005 Ryan Norton, (c) 2005 David Elliot
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -24,16 +23,17 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------
-#include "wx/mediactrl.h"
-

 //---------------------------------------------------------------------------
 // Compilation guard
 //---------------------------------------------------------------------------
 #if wxUSE_MEDIACTRL
 
 //---------------------------------------------------------------------------
 // Compilation guard
 //---------------------------------------------------------------------------
 #if wxUSE_MEDIACTRL
 

+#include "wx/mediactrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+

 //===========================================================================
 //  BACKEND DECLARATIONS
 //===========================================================================
 //===========================================================================
 //  BACKEND DECLARATIONS
 //===========================================================================


@@ -47,7 +47,6 @@
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //  QT Includes
 //---------------------------------------------------------------------------

-#include "wx/timer.h"

 #include <QuickTime/QuickTime.h>
 
 #include "wx/cocoa/autorelease.h"
 #include <QuickTime/QuickTime.h>
 
 #include "wx/cocoa/autorelease.h"