X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524c47aa3adf2af11a3069fd5da035a604f08f66..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/osx/cocoa/chkconf.h?ds=sidebyside diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h index 0dc2e991fc..09a16ab10e 100644 --- a/include/wx/osx/cocoa/chkconf.h +++ b/include/wx/osx/cocoa/chkconf.h @@ -4,7 +4,7 @@ * Author: Stefan Csomor * Modified by: * Created: 2008-07-30 - * RCS-ID: $Id: chkconf.h 54833 2008-07-29 21:03:18Z SC $ + * RCS-ID: $Id$ * Copyright: (c) Stefan Csomor * Licence: wxWindows licence */ @@ -20,8 +20,15 @@ #define wxOSX_USE_NATIVE_TOOLBAR 1 #endif -/* - * text rendering system +/* + * leave is isFlipped and don't override + */ +#ifndef wxOSX_USE_NATIVE_FLIPPED + #define wxOSX_USE_NATIVE_FLIPPED 1 +#endif + +/* + * text rendering system */ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 @@ -41,51 +48,20 @@ #endif /* - * turning off capabilities that don't work under cocoa yet + * Audio System */ -#if wxUSE_MDI -#undef wxUSE_MDI -#define wxUSE_MDI 0 -#endif - -#if wxUSE_MDI_ARCHITECTURE -#undef wxUSE_MDI_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 0 -#endif - -#if wxUSE_DRAG_AND_DROP -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 -#endif - -#if wxUSE_TASKBARICON -#undef wxUSE_TASKBARICON -#define wxUSE_TASKBARICON 0 -#endif - -#if wxUSE_TOOLTIPS -#undef wxUSE_TOOLTIPS -#define wxUSE_TOOLTIPS 0 -#endif - -#if wxUSE_DATAVIEWCTRL -#undef wxUSE_DATAVIEWCTRL -#define wxUSE_DATAVIEWCTRL 0 -#endif - -#if wxUSE_DRAG_AND_DROP -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 -#endif - -#if wxUSE_TASKBARICON -#undef wxUSE_TASKBARICON -#define wxUSE_TASKBARICON 0 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + #define wxOSX_USE_QUICKTIME 0 + #define wxOSX_USE_AUDIOTOOLBOX 1 +#else // platform < 10.5 + #define wxOSX_USE_QUICKTIME 1 + #define wxOSX_USE_AUDIOTOOLBOX 0 #endif -#define wxUSE_DOC_VIEW_ARCHITECTURE 0 -#define wxUSE_WXHTML_HELP 0 +/* + * turning off capabilities that don't work under cocoa yet + */ #endif /* _WX_MAC_CHKCONF_H_ */