Get rid of compile- and run-time checks for OS X < 10.5.
As 10.5 is the minimal supported version, it doesn't make sense to check for it (or even earlier versions) during the build or run-time. Closes #15580. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,22 +30,8 @@
|
||||
* text rendering system
|
||||
*/
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
|
||||
|
||||
#define wxOSX_USE_CORE_TEXT 1
|
||||
// MLTE-TextControl uses ATSU
|
||||
#define wxOSX_USE_ATSU_TEXT 1
|
||||
|
||||
#else // platform < 10.5
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
|
||||
#define wxOSX_USE_CORE_TEXT 1
|
||||
#else
|
||||
#define wxOSX_USE_CORE_TEXT 0
|
||||
#endif
|
||||
#define wxOSX_USE_ATSU_TEXT 1
|
||||
|
||||
#endif
|
||||
#define wxOSX_USE_CORE_TEXT 1
|
||||
#define wxOSX_USE_ATSU_TEXT 1
|
||||
|
||||
/*
|
||||
* Audio System
|
||||
|
@@ -155,9 +155,7 @@ public:
|
||||
|
||||
OSStatus EnableCellSizeModification(bool enableHeight=true, bool enableWidth=true); // enables or disables the column width and row height modification (default: false)
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
OSStatus GetAttributes (OptionBits* attributes);
|
||||
#endif
|
||||
OSStatus GetColumnWidth (DataBrowserPropertyID column, UInt16 *width ) const; // returns the column width in pixels
|
||||
OSStatus GetDefaultColumnWidth(UInt16 *width ) const; // returns the default column width in pixels
|
||||
OSStatus GetDefaultRowHeight (UInt16 * height ) const;
|
||||
@@ -166,9 +164,7 @@ public:
|
||||
OSStatus GetRowHeight (DataBrowserItemID item , UInt16 *height) const;
|
||||
OSStatus GetScrollPosition (UInt32* top, UInt32 *left) const;
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
OSStatus SetAttributes (OptionBits attributes);
|
||||
#endif
|
||||
OSStatus SetColumnWidth(DataBrowserPropertyID column, UInt16 width); // sets the column width in pixels
|
||||
OSStatus SetDefaultColumnWidth( UInt16 width );
|
||||
OSStatus SetDefaultRowHeight( UInt16 height );
|
||||
|
@@ -22,8 +22,6 @@
|
||||
// near future
|
||||
//
|
||||
|
||||
#if ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
|
||||
@@ -64,7 +62,4 @@ public:
|
||||
wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints
|
||||
};
|
||||
|
||||
#endif // defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
|
||||
|
||||
#endif
|
||||
// _WX_DRAWERWINDOW_H_
|
||||
#endif // _WX_DRAWERWINDOW_H_
|
||||
|
@@ -13,11 +13,6 @@
|
||||
#ifndef _WX_PRIVATE_H_
|
||||
#define _WX_PRIVATE_H_
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
|
||||
typedef UInt32 URefCon;
|
||||
typedef SInt32 SRefCon;
|
||||
#endif
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
#include "wx/osx/uma.h"
|
||||
@@ -29,10 +24,6 @@ typedef SInt32 SRefCon;
|
||||
|
||||
// app.h
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
|
||||
bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec);
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
// filefn.h
|
||||
@@ -269,12 +260,6 @@ ControlActionUPP GetwxMacLiveScrollbarActionProc();
|
||||
|
||||
// additional optional event defines
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
|
||||
enum {
|
||||
kEventControlFocusPartChanged = 164
|
||||
};
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl
|
||||
{
|
||||
public :
|
||||
|
@@ -41,33 +41,15 @@
|
||||
* text rendering system
|
||||
*/
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
|
||||
|
||||
#define wxOSX_USE_CORE_TEXT 1
|
||||
#define wxOSX_USE_ATSU_TEXT 0
|
||||
|
||||
#else // platform < 10.5
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
|
||||
#define wxOSX_USE_CORE_TEXT 1
|
||||
#else
|
||||
#define wxOSX_USE_CORE_TEXT 0
|
||||
#endif
|
||||
#define wxOSX_USE_ATSU_TEXT 1
|
||||
|
||||
#endif
|
||||
#define wxOSX_USE_CORE_TEXT 1
|
||||
#define wxOSX_USE_ATSU_TEXT 0
|
||||
|
||||
/*
|
||||
* Audio System
|
||||
*/
|
||||
|
||||
#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 wxOSX_USE_QUICKTIME 0
|
||||
#define wxOSX_USE_AUDIOTOOLBOX 1
|
||||
|
||||
/*
|
||||
* turning off capabilities that don't work under cocoa yet
|
||||
|
@@ -19,12 +19,6 @@
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#endif
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
|
||||
// available in 10.4 but not in the headers
|
||||
enum {
|
||||
kEventMouseScroll = 11
|
||||
};
|
||||
#endif
|
||||
//
|
||||
// shared between Cocoa and Carbon
|
||||
//
|
||||
|
@@ -45,11 +45,7 @@
|
||||
#define WX_GMTOFF_IN_TM 1
|
||||
#define HAVE_PW_GECOS 1
|
||||
#define HAVE_DLOPEN 1
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
|
||||
/* #undef HAVE_CXA_DEMANGLE */
|
||||
#else
|
||||
#define HAVE_CXA_DEMANGLE 1
|
||||
#endif
|
||||
#define HAVE_GETTIMEOFDAY 1
|
||||
#define HAVE_FSYNC 1
|
||||
#define HAVE_ROUND 1
|
||||
@@ -108,11 +104,7 @@
|
||||
#define HAVE_WCHAR_H 1
|
||||
/* better to use the built-in CF conversions, also avoid iconv versioning problems */
|
||||
/* #undef HAVE_ICONV */
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
|
||||
#define ICONV_CONST const
|
||||
#else
|
||||
#define ICONV_CONST
|
||||
#endif
|
||||
#define HAVE_LANGINFO_H 1
|
||||
#define HAVE_WCSRTOMBS 1
|
||||
#define HAVE_FPUTWS 1
|
||||
|
Reference in New Issue
Block a user