pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index f3ff582a139a7ac3686998726daf4c032bd22b43..9d525f5b592f7cd05128652332ff83e1de51d6f7 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -57,7 +57,7 @@
 #include <QuickTime/QuickTimeComponents.h>
 #endif
 
 #include <QuickTime/QuickTimeComponents.h>
 #endif
 

-#if !defined(__DARWIN__) || !defined(__LP64__)
+#if !defined(__LP64__)

 #define USE_QUICKTIME 1
 #else
 #define USE_QUICKTIME 0
 #define USE_QUICKTIME 1
 #else
 #define USE_QUICKTIME 0


@@ -480,7 +480,7 @@ bool wxQTMediaBackend::Load(const wxURI& location)
     const char* theURIString;
 
 #if wxUSE_UNICODE
     const char* theURIString;
 
 #if wxUSE_UNICODE

-    wxCharBuffer buf = wxConvLocal.cWC2MB(theURI, theURI.length(), &len);
+    wxCharBuffer buf = wxConvLocal.cWC2MB(theURI.wc_str(), theURI.length(), &len);

     theURIString = buf;
 #else
     theURIString = theURI;
     theURIString = buf;
 #else
     theURIString = theURI;


@@ -1101,7 +1101,7 @@ void wxQTMediaBackend::MacVisibilityChanged()
     if(!m_mc || !m_ctrl->m_bLoaded)
         return; //not initialized yet
 
     if(!m_mc || !m_ctrl->m_bLoaded)
         return; //not initialized yet
 

-    if(m_ctrl->MacIsReallyShown())
+    if(m_ctrl->IsShownOnScreen())

     {
         //The window is being shown again, so set the GWorld of the
         //controller back to the port of the parent WindowRef
     {
         //The window is being shown again, so set the GWorld of the
         //controller back to the port of the parent WindowRef


@@ -1126,7 +1126,7 @@ void wxQTMediaBackend::MacVisibilityChanged()
 // Suggestion from Greg Hazel to repaint the movie when idle
 // (on pause also)
 //---------------------------------------------------------------------------
 // Suggestion from Greg Hazel to repaint the movie when idle
 // (on pause also)
 //---------------------------------------------------------------------------

-void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
+void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))

 {
     // Work around Nasty OSX drawing bug:
     // http://lists.apple.com/archives/QuickTime-API/2002/Feb/msg00311.html
 {
     // Work around Nasty OSX drawing bug:
     // http://lists.apple.com/archives/QuickTime-API/2002/Feb/msg00311.html


@@ -1201,7 +1201,7 @@ pascal Boolean wxQTMediaBackend::MCFilterProc(
 // messages to our moviecontroller so it can receive mouse clicks etc.
 //---------------------------------------------------------------------------
 pascal OSStatus wxQTMediaBackend::WindowEventHandler(
 // messages to our moviecontroller so it can receive mouse clicks etc.
 //---------------------------------------------------------------------------
 pascal OSStatus wxQTMediaBackend::WindowEventHandler(

-    EventHandlerCallRef inHandlerCallRef,
+    EventHandlerCallRef WXUNUSED(inHandlerCallRef),

     EventRef inEvent,
     void *inUserData)
 {
     EventRef inEvent,
     void *inUserData)
 {