Explicitly set "C" locale for the tests using decimal point.

[wxWidgets.git] / src / osx / carbon / mediactrl.cpp

diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp
index 56503d2df06c00d6af56a72a3d2ed73a4dbefbbf..ba2e5831e587fc6864c7db386454264cb2253e55 100644 (file)
--- a/src/osx/carbon/mediactrl.cpp
+++ b/src/osx/carbon/mediactrl.cpp
@@ -86,6 +86,11 @@ public:
 
     virtual bool Load(const wxString& fileName);
     virtual bool Load(const wxURI& location);
+    virtual bool Load(const wxURI& location,
+                      const wxURI& WXUNUSED(proxy))
+    {
+        return Load(location);
+    }
 
     virtual bool Play();
     virtual bool Pause();
@@ -322,7 +327,7 @@ wxQTMediaBackend::~wxQTMediaBackend()
         // Dispose of the movie controller
         ::DisposeMovieController(m_mc);
         m_mc = NULL;
-        
+
         // Dispose of offscreen GWorld
         ::DisposeGWorld(m_movieWorld);
     }
@@ -430,7 +435,7 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
         NULL); // wasChanged
 
     // Do not use ::GetMoviesStickyError() here because it returns -2009
-    // a.k.a. invalid track on valid mpegs          
+    // a.k.a. invalid track on valid mpegs
     if (err == noErr && ::GetMoviesError() == noErr)
     {
         ::CloseMovieFile(movieResFile);
@@ -870,11 +875,7 @@ wxMediaState wxQTMediaBackend::GetState()
 void wxQTMediaBackend::Cleanup()
 {
     m_bPlaying = false;
-    if (m_timer)
-    {
-        delete m_timer;
-        m_timer = NULL;
-    }
+    wxDELETE(m_timer);
 
     // Stop the movie:
     // Apple samples with CreateMovieControl typically