mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
Fixed a minor leak in CoreAudioFormat. Fixed incorrect OSX and iOS version reporting. Added Xext library to linux introjucer build. Mac menu shortcut key fix.
This commit is contained in:
parent
75ad1071ad
commit
2a780902ba
5 changed files with 12 additions and 11 deletions
|
|
@ -46,6 +46,7 @@ namespace
|
|||
extensionsArray.add ("." + String::fromCFString ((CFStringRef) CFArrayGetValueAtIndex (extensions, i)));
|
||||
}
|
||||
|
||||
CFRelease (extensions);
|
||||
return extensionsArray;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,16 +110,16 @@ SystemStats::OperatingSystemType SystemStats::getOperatingSystemType()
|
|||
String SystemStats::getOperatingSystemName()
|
||||
{
|
||||
#if JUCE_IOS
|
||||
String s ("iOS ");
|
||||
return "iOS " + nsStringToJuce ([[UIDevice currentDevice] systemVersion]);
|
||||
#else
|
||||
SInt32 major, minor;
|
||||
Gestalt (gestaltSystemVersionMajor, &major);
|
||||
Gestalt (gestaltSystemVersionMinor, &minor);
|
||||
|
||||
String s ("Mac OSX ");
|
||||
#endif
|
||||
|
||||
struct utsname uts;
|
||||
if (uname (&uts) >= 0)
|
||||
s << uts.release;
|
||||
|
||||
s << (int) major << '.' << (int) minor;
|
||||
return s;
|
||||
#endif
|
||||
}
|
||||
|
||||
#if ! JUCE_IOS
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ public:
|
|||
if (key == 0)
|
||||
key = (juce_wchar) kp.getKeyCode();
|
||||
|
||||
[item setKeyEquivalent: juceStringToNS (String::charToString (key))];
|
||||
[item setKeyEquivalent: juceStringToNS (String::charToString (key).toLowerCase())];
|
||||
[item setKeyEquivalentModifierMask: juceModsToNSMods (kp.getModifiers())];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -200,8 +200,8 @@ public:
|
|||
/** Pops up a modal dialog box that allows this toolbar to be customised by the user.
|
||||
|
||||
The dialog contains a ToolbarItemPalette and various controls for editing other
|
||||
aspects of the toolbar. This method will block and run the dialog box modally,
|
||||
returning when the user closes it.
|
||||
aspects of the toolbar. The dialog box will be opened modally, but the method will
|
||||
return immediately.
|
||||
|
||||
The factory is used to determine the set of items that will be shown on the
|
||||
palette.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue