Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index 5b6aef7f1f85f6ccd05a28e22c83be05083f751d..7a1dd947f75e4c81305e231d6ab1e39a3acdfd27 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -224,7 +224,7 @@ wxQTMediaBackend::~wxQTMediaBackend()
     if(m_timer)
         Cleanup();
 
     if(m_timer)
         Cleanup();
 

-    //Note that ExitMovies() is not neccessary...
+    //Note that ExitMovies() is not necessary...

     ExitMovies();
 }
 
     ExitMovies();
 }
 


@@ -298,6 +298,12 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
     short movieResFile;
     FSSpec sfFile;
     
     short movieResFile;
     FSSpec sfFile;
     

+    //FIXME:wxMacFilename2FSSpec crashes on empty string - 
+    //does it crash on other strings too and should this
+    //"fix" be put in the carbon wxSound?
+    if (fileName.empty())
+        return false;
+    

     wxMacFilename2FSSpec( fileName , &sfFile );
     
     if (OpenMovieFile (&sfFile, &movieResFile, fsRdPerm) != noErr)
     wxMacFilename2FSSpec( fileName , &sfFile );
     
     if (OpenMovieFile (&sfFile, &movieResFile, fsRdPerm) != noErr)


@@ -461,7 +467,7 @@ void wxQTMediaBackend::FinishLoad()
     //
     //Here, if the parent of the control has a sizer - we
     //tell it to recalculate the size of this control since
     //
     //Here, if the parent of the control has a sizer - we
     //tell it to recalculate the size of this control since

-    //the user opened a seperate media file
+    //the user opened a separate media file

     //
     m_ctrl->InvalidateBestSize();
     m_ctrl->GetParent()->Layout();
     //
     m_ctrl->InvalidateBestSize();
     m_ctrl->GetParent()->Layout();