From 2e2cfd9d55708aca49174461a8448ecd9ff2d737 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 15 Jul 2014 19:28:05 +0000 Subject: [PATCH] fixing and expanding switches git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/mediactrl.mm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/osx/cocoa/mediactrl.mm b/src/osx/cocoa/mediactrl.mm index d6619bf783..dd7cf74154 100644 --- a/src/osx/cocoa/mediactrl.mm +++ b/src/osx/cocoa/mediactrl.mm @@ -36,18 +36,26 @@ #include "wx/osx/private.h" -#ifdef wxOSX_USE_IPHONE -#define wxOSX_USE_QTKIT 0 -#define wxOSX_USE_AVFOUNDATION 1 +#ifndef wxOSX_USE_QTKIT + #if wxOSX_USE_IPHONE + #define wxOSX_USE_QTKIT 0 + #define wxOSX_USE_AVFOUNDATION 1 + #else + #define wxOSX_USE_QTKIT 1 + #define wxOSX_USE_AVFOUNDATION 0 + #endif #else -#define wxOSX_USE_QTKIT 1 -#define wxOSX_USE_AVFOUNDATION 0 + #if wxOSX_USE_QTKIT + #define wxOSX_USE_AVFOUNDATION 0 + #else + #define wxOSX_USE_AVFOUNDATION 1 + #endif #endif #if wxOSX_USE_AVFOUNDATION && wxOSX_USE_COCOA && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 -#define wxOSX_USE_AVKIT 1 + #define wxOSX_USE_AVKIT 1 #else -#define wxOSX_USE_AVKIT 0 + #define wxOSX_USE_AVKIT 0 #endif //===========================================================================