mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fix for mac font use with the 10.5 SDK.

Browse source
This commit is contained in:
Julian Storer 2011-04-23 11:18:53 +01:00
parent 328cc11713
commit 06d2fe4887
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
juce_amalgamated.cpp
View file

@ -271956,7 +271956,8 @@ JUCE_API bool JUCE_CALLTYPE Process::isRunningUnderDebugger()
// compiled on its own).
#if JUCE_INCLUDED_FILE
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \
&& MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \
|| (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2)
#define JUCE_CORETEXT_AVAILABLE 1
#endif
@ -276957,7 +276958,8 @@ MidiInput* MidiInput::openDevice (int index, MidiInputCallback* callback) { re
// compiled on its own).
#if JUCE_INCLUDED_FILE
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \
&& MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \
|| (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2)
#define JUCE_CORETEXT_AVAILABLE 1
#endif

4
juce_amalgamated.h
View file

@ -73,7 +73,7 @@ namespace JuceDummyNamespace {}
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 53
#define JUCE_BUILDNUMBER 80
#define JUCE_BUILDNUMBER 81
/** Current Juce version number.
@ -21599,7 +21599,7 @@ class WeakReference
{
public:
/** Creates a null SafePointer. */
WeakReference() noexcept {}
inline WeakReference() noexcept {}
/** Creates a WeakReference that points at the given object. */
WeakReference (ObjectType* const object) : holder (object != nullptr ? object->getWeakReference() : nullptr) {}

2
src/core/juce_StandardHeader.h
View file

@ -33,7 +33,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 53
#define JUCE_BUILDNUMBER 80
#define JUCE_BUILDNUMBER 81
/** Current Juce version number.

2
src/memory/juce_WeakReference.h
View file

@ -86,7 +86,7 @@ class WeakReference
{
public:
/** Creates a null SafePointer. */
WeakReference() noexcept {}
inline WeakReference() noexcept {}
/** Creates a WeakReference that points at the given object. */
WeakReference (ObjectType* const object) : holder (object != nullptr ? object->getWeakReference() : nullptr) {}

3
src/native/mac/juce_mac_Fonts.mm
View file

@ -27,7 +27,8 @@
// compiled on its own).
#if JUCE_INCLUDED_FILE
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \
#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \
&& MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \
|| (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2)
#define JUCE_CORETEXT_AVAILABLE 1
#endif