Browse Source

tags/2021-05-28
jules 17 years ago
parent
commit
adf599e942
3 changed files with 12 additions and 1 deletions
  1. +3
    -0
      build/macosx/platform_specific_code/juce_mac_SystemStats.cpp
  2. +2
    -1
      build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm
  3. +7
    -0
      src/juce_core/text/juce_String.cpp

+ 3
- 0
build/macosx/platform_specific_code/juce_mac_SystemStats.cpp View File

@@ -30,6 +30,7 @@
*/
#include "../../../src/juce_core/basics/juce_StandardHeader.h"
#include <AppKit/AppKit.h>
#include <Carbon/Carbon.h>
#include <CoreAudio/HostTime.h>
#include <ctime>
@@ -145,6 +146,8 @@ void SystemStats::initialiseStats() throw()
{
initialised = true;
NSApplicationLoad();
#if JUCE_INTEL
{
unsigned int familyModel, extFeatures;


+ 2
- 1
build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm View File

@@ -32,6 +32,7 @@
#include "../../../src/juce_core/basics/juce_StandardHeader.h"

#include <Cocoa/Cocoa.h>
#include <WebKit/WebKit.h>
#include <WebKit/HIWebView.h>
#include <WebKit/WebPolicyDelegate.h>
#include <WebKit/CarbonUtils.h>
@@ -226,7 +227,7 @@ public:

void stop()
{
[webView stopLoading];
[webView stopLoading: nil];
}

void updateBounds()


+ 7
- 0
src/juce_core/text/juce_String.cpp View File

@@ -1281,7 +1281,14 @@ void String::vprintf (const tchar* const pf, va_list& args) throw()
do
{
#if JUCE_LINUX && JUCE_64BIT
va_list tempArgs;
va_copy (tempArgs, args);
const int num = CharacterFunctions::vprintf (buf, bufSize - 1, pf, tempArgs);
va_end (tempArgs);
#else
const int num = CharacterFunctions::vprintf (buf, bufSize - 1, pf, args);
#endif
if (num > 0)
{


Loading…
Cancel
Save