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

Updates to keep Xcode 4.3 happy.

Browse source
This commit is contained in:
jules 2012-02-23 21:10:49 +00:00
parent d2a4173ab4
commit b6a22826fe
5 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_44.h
View file

@ -24,31 +24,31 @@ static const vorbis_info_psy_global _psy_global_44[5]={
{20.f,14.f,12.f,12.f,12.f,12.f,12.f},
{-60.f,-30.f,-40.f,-40.f,-40.f,-40.f,-40.f}, 2,-75.f,
-6.f,
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
{99},{{99},{99}},{0},{0},{{0},{0}}
},
{8, /* lines per eighth octave */
{14.f,10.f,10.f,10.f,10.f,10.f,10.f},
{-40.f,-30.f,-25.f,-25.f,-25.f,-25.f,-25.f}, 2,-80.f,
-6.f,
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
{99},{{99},{99}},{0},{0},{{0},{0}}
},
{8, /* lines per eighth octave */
{12.f,10.f,10.f,10.f,10.f,10.f,10.f},
{-20.f,-20.f,-15.f,-15.f,-15.f,-15.f,-15.f}, 0,-80.f,
-6.f,
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
{99},{{99},{99}},{0},{0},{{0},{0}}
},
{8, /* lines per eighth octave */
{10.f,8.f,8.f,8.f,8.f,8.f,8.f},
{-20.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-80.f,
-6.f,
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
{99},{{99},{99}},{0},{0},{{0},{0}}
},
{8, /* lines per eighth octave */
{10.f,6.f,6.f,6.f,6.f,6.f,6.f},
{-15.f,-15.f,-12.f,-12.f,-12.f,-12.f,-12.f}, 0,-85.f,
-6.f,
{99.},{{99.},{99.}},{0},{0},{{0.},{0.}}
{99},{{99},{99}},{0},{0},{{0},{0}}
},
};

6
modules/juce_graphics/colour/juce_Colours.cpp
View file

@ -168,7 +168,7 @@ const Colour Colours::yellowgreen (0xff9acd32);
Colour Colours::findColourForName (const String& colourName,
const Colour& defaultColour)
{
static const int presets[] =
static const uint32 presets[] =
{
// (first value is the string's hashcode, second is ARGB)
@ -311,11 +311,11 @@ Colour Colours::findColourForName (const String& colourName,
0xe1b5130f, 0xff9acd32 /* yellowgreen */
};
const int hash = colourName.trim().toLowerCase().hashCode();
const uint32 hash = (uint32) colourName.trim().toLowerCase().hashCode();
for (int i = 0; i < numElementsInArray (presets); i += 2)
if (presets [i] == hash)
return Colour ((uint32) presets [i + 1]);
return Colour (presets [i + 1]);
return defaultColour;
}

5
modules/juce_gui_basics/components/juce_Component.cpp
View file

@ -674,9 +674,12 @@ void Component::addToDesktop (int styleWanted, void* nativeWindowToAttachTo)
bounds.setPosition (topLeft);
peer->setBounds (topLeft.x, topLeft.y, getWidth(), getHeight(), false);
peer->setVisible (isVisible());
peer = ComponentPeer::getPeerFor (this);
if (peer == nullptr)
return;
if (wasFullscreen)
{
peer->setFullScreen (true);

8
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp
View file

@ -130,11 +130,11 @@ LookAndFeel::LookAndFeel()
jassert (Colours::white == Colour (0xffffffff));
// set up the standard set of colours..
const int textButtonColour = 0xffbbbbff;
const int textHighlightColour = 0x401111ee;
const int standardOutlineColour = 0xb2808080;
const uint32 textButtonColour = 0xffbbbbff;
const uint32 textHighlightColour = 0x401111ee;
const uint32 standardOutlineColour = 0xb2808080;
static const int standardColours[] =
static const uint32 standardColours[] =
{
TextButton::buttonColourId, textButtonColour,
TextButton::buttonOnColourId, 0xff4444ff,

14
modules/juce_opengl/native/juce_mac_OpenGLComponent.mm
View file

@ -133,13 +133,13 @@ public:
NSOpenGLPFAMPSafe,
NSOpenGLPFAClosestPolicy,
NSOpenGLPFANoRecovery,
NSOpenGLPFAColorSize, pixelFormat.redBits + pixelFormat.greenBits + pixelFormat.blueBits,
NSOpenGLPFAAlphaSize, pixelFormat.alphaBits,
NSOpenGLPFADepthSize, pixelFormat.depthBufferBits,
NSOpenGLPFAStencilSize, pixelFormat.stencilBufferBits,
NSOpenGLPFAAccumSize, pixelFormat.accumulationBufferRedBits + pixelFormat.accumulationBufferGreenBits
+ pixelFormat.accumulationBufferBlueBits + pixelFormat.accumulationBufferAlphaBits,
pixelFormat.multisamplingLevel > 0 ? NSOpenGLPFASamples : 0, pixelFormat.multisamplingLevel,
NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute) (pixelFormat.redBits + pixelFormat.greenBits + pixelFormat.blueBits),
NSOpenGLPFAAlphaSize, (NSOpenGLPixelFormatAttribute) pixelFormat.alphaBits,
NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute) pixelFormat.depthBufferBits,
NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute) pixelFormat.stencilBufferBits,
NSOpenGLPFAAccumSize, (NSOpenGLPixelFormatAttribute) (pixelFormat.accumulationBufferRedBits + pixelFormat.accumulationBufferGreenBits
+ pixelFormat.accumulationBufferBlueBits + pixelFormat.accumulationBufferAlphaBits),
pixelFormat.multisamplingLevel > 0 ? NSOpenGLPFASamples : (NSOpenGLPixelFormatAttribute) 0, (NSOpenGLPixelFormatAttribute) pixelFormat.multisamplingLevel,
0
};