Browse Source

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.

tags/2021-05-28
jules 14 years ago
parent
commit
2a780902ba
5 changed files with 12 additions and 11 deletions
  1. +1
    -1
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h
  2. +1
    -0
      modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp
  3. +7
    -7
      modules/juce_core/native/juce_mac_SystemStats.mm
  4. +1
    -1
      modules/juce_gui_basics/native/juce_mac_MainMenu.mm
  5. +2
    -2
      modules/juce_gui_basics/widgets/juce_Toolbar.h

+ 1
- 1
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h View File

@@ -166,7 +166,7 @@ private:
out << " -L" << libraryPaths.getReference(i).toUnixStyle().quoted();
}
const char* defaultLibs[] = { "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound", 0 };
const char* defaultLibs[] = { "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound", "Xext", 0 };
StringArray libs (defaultLibs);
for (int i = 0; i < libs.size(); ++i)


+ 1
- 0
modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp View File

@@ -46,6 +46,7 @@ namespace
extensionsArray.add ("." + String::fromCFString ((CFStringRef) CFArrayGetValueAtIndex (extensions, i)));
}
CFRelease (extensions);
return extensionsArray;
}
}


+ 7
- 7
modules/juce_core/native/juce_mac_SystemStats.mm View File

@@ -110,16 +110,16 @@ SystemStats::OperatingSystemType SystemStats::getOperatingSystemType()
String SystemStats::getOperatingSystemName()
{
#if JUCE_IOS
String s ("iOS ");
return "iOS " + nsStringToJuce ([[UIDevice currentDevice] systemVersion]);
#else
String s ("Mac OSX ");
#endif
struct utsname uts;
if (uname (&uts) >= 0)
s << uts.release;
SInt32 major, minor;
Gestalt (gestaltSystemVersionMajor, &major);
Gestalt (gestaltSystemVersionMinor, &minor);
String s ("Mac OSX ");
s << (int) major << '.' << (int) minor;
return s;
#endif
}
#if ! JUCE_IOS


+ 1
- 1
modules/juce_gui_basics/native/juce_mac_MainMenu.mm View File

@@ -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())];
}
}


+ 2
- 2
modules/juce_gui_basics/widgets/juce_Toolbar.h View File

@@ -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…
Cancel
Save