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

Minor fix for the linux build, and small fix for TreeView dragging logic

Browse source
This commit is contained in:
Julian Storer 2009-10-27 17:04:51 +00:00
parent 7e56a7514c
commit 5b7f6f0f23
38 changed files with 93 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -11,6 +11,8 @@
*.pdb
*.dep
*.idb
*.manifest
*.manifest.res
extras/juce demo/build/macosx/build
extras/juce demo/build/win32_vc8/Debug
extras/juce demo/build/win32_vc8/Release

93
juce_amalgamated.cpp
View file

@ -717,6 +717,7 @@ public:
#import <IOKit/hid/IOHIDLib.h>
#import <IOKit/hid/IOHIDKeys.h>
#import <IOKit/pwr_mgt/IOPMLib.h>
#include <Carbon/Carbon.h>
#include <sys/dir.h>
#include <sys/socket.h>
#endif
@ -52044,8 +52045,7 @@ public:
bool keep = false;
if ((itemsToKeep[i] || (comp == Component::getComponentUnderMouse() && comp->isMouseButtonDown()))
&& isParentOf (comp))
if (isParentOf (comp))
{
if (itemsToKeep[i])
{
@ -52060,8 +52060,13 @@ public:
comp->setBounds (pos);
}
}
else
if ((! keep)
&& Component::isMouseButtonDownAnywhere()
&& (comp == Component::getComponentUnderMouse()
|| comp->isParentOf (Component::getComponentUnderMouse())))
{
keep = true;
comp->setSize (0, 0);
}
}
@ -61078,7 +61083,7 @@ void LookAndFeel::drawScrollbar (Graphics& g,
gy2 = y + height * 0.7f;
}
const Colour thumbColour (scrollbar.findColour (ScrollBar::trackColourId));
const Colour thumbColour (scrollbar.findColour (ScrollBar::thumbColourId));
GradientBrush gb (thumbColour.overlaidWith (Colour (0x44000000)),
gx1, gy1,
@ -248871,7 +248876,7 @@ void InterProcessLock::exit() throw()
/********* Start of inlined file: juce_linux_Files.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#define U_ISOFS_SUPER_MAGIC (short) 0x9660 // linux/iso_fs.h
#define U_MSDOS_SUPER_MAGIC (short) 0x4d44 // linux/msdos_fs.h
@ -249474,7 +249479,7 @@ int NamedPipe::write (const void* sourceBuffer, int numBytesToWrite, int timeOut
/********* Start of inlined file: juce_linux_Network.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
int SystemStats::getMACAddresses (int64* addresses, int maxNum, const bool littleEndian) throw()
{
@ -249921,7 +249926,7 @@ int juce_seekInInternetFile (void* handle, int newPosition)
/********* Start of inlined file: juce_linux_SystemStats.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
/*static juce_noinline unsigned int getCPUIDWord (int* familyModel, int* extFeatures) throw()
{
@ -250151,7 +250156,7 @@ void PlatformUtilities::fpuReset()
/********* Start of inlined file: juce_linux_Threads.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
/*
Note that a lot of methods that you'd expect to find in this file actually
@ -250383,7 +250388,7 @@ void* PlatformUtilities::getProcedureEntryPoint (void* libraryHandle, const Stri
/********* Start of inlined file: juce_linux_Messaging.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#ifdef JUCE_DEBUG
#define JUCE_DEBUG_XERRORS 1
@ -250760,7 +250765,7 @@ bool juce_dispatchNextMessageOnSystemQueue (bool returnIfNoPendingMessages)
/********* Start of inlined file: juce_linux_Fonts.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class FreeTypeFontFace
{
@ -251347,7 +251352,7 @@ void Typeface::getDefaultFontNames (String& defaultSans, String& defaultSerif, S
/********* Start of inlined file: juce_linux_Windowing.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#define TAKE_FOCUS 0
#define DELETE_WINDOW 1
@ -254587,7 +254592,7 @@ const int KeyPress::rewindKey = (0xffeeff03) | extendedKeyModifier;
/********* Start of inlined file: juce_linux_Audio.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE && JUCE_ALSA
#if JUCE_INCLUDED_FILE && JUCE_ALSA
static const int maxNumChans = 64;
@ -255546,9 +255551,7 @@ AudioIODeviceType* juce_createAudioIODeviceType_ALSA()
/********* Start of inlined file: juce_linux_Midi.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_ALSA
#if JUCE_INCLUDED_FILE && JUCE_ALSA
static snd_seq_t* iterateDevices (const bool forInput,
StringArray& deviceNamesFound,
@ -255970,7 +255973,7 @@ MidiInput* MidiInput::createNewDevice (const String&, MidiInputCallback*) { re
/********* Start of inlined file: juce_linux_AudioCDReader.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
AudioCDReader::AudioCDReader()
: AudioFormatReader (0, T("CD Audio"))
@ -256047,7 +256050,7 @@ int AudioCDReader::getCDDBId()
/********* Start of inlined file: juce_linux_FileChooser.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
void FileChooser::showPlatformDialog (OwnedArray<File>& results,
const String& title,
@ -256069,9 +256072,7 @@ void FileChooser::showPlatformDialog (OwnedArray<File>& results,
/********* Start of inlined file: juce_linux_WebBrowserComponent.cpp *********/
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_WEB_BROWSER
#if JUCE_INCLUDED_FILE && JUCE_WEB_BROWSER
/*
Sorry.. This class isn't implemented on Linux!
@ -256165,7 +256166,6 @@ bool WebBrowserComponent::pageAboutToLoad (const String& url)
return true;
}
#endif
#endif
/********* End of inlined file: juce_linux_WebBrowserComponent.cpp *********/
@ -256220,7 +256220,7 @@ BEGIN_JUCE_NAMESPACE
/********* Start of inlined file: juce_mac_Strings.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
static const String nsStringToJuce (NSString* s)
{
@ -256391,7 +256391,7 @@ const String SystemClipboard::getTextFromClipboard() throw()
/********* Start of inlined file: juce_mac_SystemStats.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
static int64 highResTimerFrequency = 0;
static double highResTimerToMillisecRatio = 0;
@ -257213,7 +257213,7 @@ int NamedPipe::write (const void* sourceBuffer, int numBytesToWrite, int timeOut
/********* Start of inlined file: juce_mac_Threads.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
/*
Note that a lot of methods that you'd expect to find in this file actually
@ -257789,7 +257789,7 @@ void InterProcessLock::exit() throw()
/********* Start of inlined file: juce_mac_Files.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
/*
Note that a lot of methods that you'd expect to find in this file actually
@ -258274,7 +258274,8 @@ OSType PlatformUtilities::getTypeOfFile (const String& filename)
#else
NSDictionary* fileDict = [[NSFileManager defaultManager] fileAttributesAtPath: juceStringToNS (filename) traverseLink: NO];
#endif
return (OSType) [fileDict objectForKey: NSFileHFSTypeCode];
//return (OSType) [fileDict objectForKey: NSFileHFSTypeCode];
return [fileDict fileHFSTypeCode];
}
bool PlatformUtilities::isBundle (const String& filename)
@ -258295,7 +258296,7 @@ bool PlatformUtilities::isBundle (const String& filename)
/********* Start of inlined file: juce_iphone_MiscUtilities.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
static JUCEApplication* juce_intialisingApp;
@ -258437,7 +258438,7 @@ void juce_updateMultiMonitorInfo (Array <Rectangle>& monitorCoords, const bool c
/********* Start of inlined file: juce_mac_MiscUtilities.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
ScopedAutoReleasePool::ScopedAutoReleasePool()
{
@ -258671,7 +258672,7 @@ void juce_updateMultiMonitorInfo (Array <Rectangle>& monitorCoords, const bool c
/********* Start of inlined file: juce_mac_Debugging.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
void Logger::outputDebugString (const String& text) throw()
{
@ -258718,7 +258719,7 @@ bool JUCE_CALLTYPE Process::isRunningUnderDebugger() throw()
/********* Start of inlined file: juce_iphone_UIViewComponentPeer.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class UIViewComponentPeer;
@ -259596,7 +259597,7 @@ const int KeyPress::rewindKey = 0x30003;
/********* Start of inlined file: juce_iphone_Fonts.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class FontHelper
{
@ -259921,7 +259922,7 @@ void Typeface::getDefaultFontNames (String& defaultSans, String& defaultSerif, S
/********* Start of inlined file: juce_iphone_MessageManager.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
struct CallbackMessagePayload
{
@ -260223,7 +260224,7 @@ void* MessageManager::callFunctionOnMessageThread (MessageCallbackFunction* call
/********* Start of inlined file: juce_mac_FileChooser.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC
@ -260679,7 +260680,7 @@ void juce_glViewport (const int w, const int h)
/********* Start of inlined file: juce_mac_MouseCursor.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC
@ -261162,7 +261163,7 @@ bool WebBrowserComponent::pageAboutToLoad (const String& url)
/********* Start of inlined file: juce_iphone_Audio.cpp *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class IPhoneAudioIODevice : public AudioIODeviceType
{
@ -261450,7 +261451,7 @@ AudioIODeviceType* juce_createAudioIODeviceType_iPhoneAudio()
/********* Start of inlined file: juce_mac_CoreMidi.cpp *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC
@ -262060,7 +262061,7 @@ MidiInput* MidiInput::openDevice (int index, MidiInputCallback* callback)
/********* Start of inlined file: juce_mac_NSViewComponentPeer.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class NSViewComponentPeer;
@ -263598,7 +263599,7 @@ const int KeyPress::rewindKey = 0x30003;
/********* Start of inlined file: juce_mac_MouseCursor.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC
@ -263776,7 +263777,7 @@ void MouseCursor::showInWindow (ComponentPeer*) const throw()
/********* Start of inlined file: juce_mac_NSViewComponent.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class NSViewComponentInternal : public ComponentMovementWatcher
{
@ -263905,7 +263906,7 @@ void NSViewComponent::paint (Graphics& g)
/********* Start of inlined file: juce_mac_AppleRemote.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
AppleRemoteDevice::AppleRemoteDevice()
: device (0),
@ -264459,7 +264460,7 @@ void juce_glViewport (const int w, const int h)
/********* Start of inlined file: juce_mac_MainMenu.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class JuceMainMenuHandler;
@ -264942,7 +264943,7 @@ void initialiseMainMenu()
/********* Start of inlined file: juce_mac_FileChooser.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC
@ -265762,7 +265763,7 @@ void AudioCDReader::ejectDisk()
/********* Start of inlined file: juce_mac_Fonts.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class FontHelper
{
@ -266088,7 +266089,7 @@ void Typeface::getDefaultFontNames (String& defaultSans, String& defaultSerif, S
/********* Start of inlined file: juce_mac_MessageManager.mm *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
struct CallbackMessagePayload
{
@ -266836,7 +266837,7 @@ bool WebBrowserComponent::pageAboutToLoad (const String& url)
/********* Start of inlined file: juce_mac_CoreAudio.cpp *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#ifndef JUCE_COREAUDIO_ERROR_LOGGING_ENABLED
#define JUCE_COREAUDIO_ERROR_LOGGING_ENABLED 1
@ -268172,7 +268173,7 @@ AudioIODeviceType* juce_createAudioIODeviceType_CoreAudio()
/********* Start of inlined file: juce_mac_CoreMidi.cpp *********/
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC

10
src/gui/components/controls/juce_TreeView.cpp
View file

@ -218,8 +218,7 @@ public:
bool keep = false;
if ((itemsToKeep[i] || (comp == Component::getComponentUnderMouse() && comp->isMouseButtonDown()))
&& isParentOf (comp))
if (isParentOf (comp))
{
if (itemsToKeep[i])
{
@ -234,8 +233,13 @@ public:
comp->setBounds (pos);
}
}
else
if ((! keep)
&& Component::isMouseButtonDownAnywhere()
&& (comp == Component::getComponentUnderMouse()
|| comp->isParentOf (Component::getComponentUnderMouse())))
{
keep = true;
comp->setSize (0, 0);
}
}

2
src/gui/components/lookandfeel/juce_LookAndFeel.cpp
View file

@ -774,7 +774,7 @@ void LookAndFeel::drawScrollbar (Graphics& g,
gy2 = y + height * 0.7f;
}
const Colour thumbColour (scrollbar.findColour (ScrollBar::trackColourId));
const Colour thumbColour (scrollbar.findColour (ScrollBar::thumbColourId));
GradientBrush gb (thumbColour.overlaidWith (Colour (0x44000000)),
gx1, gy1,

2
src/native/linux/juce_linux_Audio.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE && JUCE_ALSA
#if JUCE_INCLUDED_FILE && JUCE_ALSA
//==============================================================================
static const int maxNumChans = 64;

2
src/native/linux/juce_linux_AudioCDReader.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/linux/juce_linux_FileChooser.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
void FileChooser::showPlatformDialog (OwnedArray<File>& results,

2
src/native/linux/juce_linux_Files.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#define U_ISOFS_SUPER_MAGIC (short) 0x9660 // linux/iso_fs.h
#define U_MSDOS_SUPER_MAGIC (short) 0x4d44 // linux/msdos_fs.h

2
src/native/linux/juce_linux_Fonts.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/linux/juce_linux_Messaging.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
#ifdef JUCE_DEBUG

4
src/native/linux/juce_linux_Midi.cpp
View file

@ -25,9 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_ALSA
#if JUCE_INCLUDED_FILE && JUCE_ALSA
//==============================================================================
static snd_seq_t* iterateDevices (const bool forInput,

2
src/native/linux/juce_linux_Network.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/linux/juce_linux_SystemStats.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/linux/juce_linux_Threads.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
/*
Note that a lot of methods that you'd expect to find in this file actually

5
src/native/linux/juce_linux_WebBrowserComponent.cpp
View file

@ -25,9 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_WEB_BROWSER
#if JUCE_INCLUDED_FILE && JUCE_WEB_BROWSER
/*
Sorry.. This class isn't implemented on Linux!
@ -126,4 +124,3 @@ bool WebBrowserComponent::pageAboutToLoad (const String& url)
}
#endif
#endif

2
src/native/linux/juce_linux_Windowing.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_linux_NativeCode.cpp, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
#define TAKE_FOCUS 0

2
src/native/mac/juce_iphone_Audio.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE

2
src/native/mac/juce_iphone_Fonts.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/mac/juce_iphone_MessageManager.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
struct CallbackMessagePayload
{

2
src/native/mac/juce_iphone_MiscUtilities.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/mac/juce_iphone_UIViewComponentPeer.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class UIViewComponentPeer;

2
src/native/mac/juce_mac_AppleRemote.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
AppleRemoteDevice::AppleRemoteDevice()

2
src/native/mac/juce_mac_CoreAudio.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/mac/juce_mac_CoreMidi.cpp
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC

2
src/native/mac/juce_mac_Debugging.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
void Logger::outputDebugString (const String& text) throw()

2
src/native/mac/juce_mac_FileChooser.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC

5
src/native/mac/juce_mac_Files.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
/*
Note that a lot of methods that you'd expect to find in this file actually
@ -521,7 +521,8 @@ OSType PlatformUtilities::getTypeOfFile (const String& filename)
#else
NSDictionary* fileDict = [[NSFileManager defaultManager] fileAttributesAtPath: juceStringToNS (filename) traverseLink: NO];
#endif
return (OSType) [fileDict objectForKey: NSFileHFSTypeCode];
//return (OSType) [fileDict objectForKey: NSFileHFSTypeCode];
return [fileDict fileHFSTypeCode];
}
bool PlatformUtilities::isBundle (const String& filename)

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

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/mac/juce_mac_MainMenu.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
class JuceMainMenuHandler;

2
src/native/mac/juce_mac_MessageManager.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
struct CallbackMessagePayload
{

2
src/native/mac/juce_mac_MiscUtilities.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================

2
src/native/mac/juce_mac_MouseCursor.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
#if JUCE_MAC

2
src/native/mac/juce_mac_NSViewComponent.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
class NSViewComponentInternal : public ComponentMovementWatcher

2
src/native/mac/juce_mac_NSViewComponentPeer.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
class NSViewComponentPeer;

1
src/native/mac/juce_mac_NativeIncludes.h
View file

@ -56,6 +56,7 @@
#import <IOKit/hid/IOHIDLib.h>
#import <IOKit/hid/IOHIDKeys.h>
#import <IOKit/pwr_mgt/IOPMLib.h>
#include <Carbon/Carbon.h>
#include <sys/dir.h>
#include <sys/socket.h>
#endif

2
src/native/mac/juce_mac_Strings.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
static const String nsStringToJuce (NSString* s)

2
src/native/mac/juce_mac_SystemStats.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
static int64 highResTimerFrequency = 0;
static double highResTimerToMillisecRatio = 0;

2
src/native/mac/juce_mac_Threads.mm
View file

@ -25,7 +25,7 @@
// (This file gets included by juce_mac_NativeCode.mm, rather than being
// compiled on its own).
#ifdef JUCE_INCLUDED_FILE
#if JUCE_INCLUDED_FILE
//==============================================================================
/*