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

Tweaked some syntax to help with Clang/Windows compatibility

Browse source
This commit is contained in:
jules 2015-08-08 12:54:59 +01:00
parent 3960020891
commit 6db05a6100
7 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
View file

@ -89,7 +89,7 @@ public:
void drawTabButton (TabBarButton& button, Graphics&, bool isMouseOver, bool isMouseDown) override;
void drawTabAreaBehindFrontButton (TabbedButtonBar&, Graphics&, int, int) override {}
int getTabButtonBestWidth (TabBarButton&, int tabDepth) override;
void drawConcertinaPanelHeader (Graphics&, const Rectangle<int>&, bool, bool, ConcertinaPanel&, Component&) override;
void drawConcertinaPanelHeader (Graphics&, const juce::Rectangle<int>&, bool, bool, ConcertinaPanel&, Component&) override;
static Colour getTabBackgroundColour (TabBarButton&);
private:

2
extras/Introjucer/Source/Utility/jucer_Icons.h
View file

@ -33,7 +33,7 @@ struct Icon
Icon (const Path& p, Colour c) : path (&p), colour (c) {}
Icon (const Path* p, Colour c) : path (p), colour (c) {}
void draw (Graphics& g, const Rectangle<float>& area, bool isCrossedOut) const
void draw (Graphics& g, const juce::Rectangle<float>& area, bool isCrossedOut) const
{
if (path != nullptr)
{

2
extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
View file

@ -435,7 +435,7 @@ private:
void resized() override
{
Rectangle<int> r (getLocalBounds());
juce::Rectangle<int> r (getLocalBounds());
button.setBounds (r.removeFromRight (24));
textbox.setBounds (r);

2
modules/juce_core/maths/juce_MathsFunctions.h
View file

@ -88,7 +88,7 @@ typedef unsigned int uint32;
typedef unsigned int pointer_sized_uint;
#endif
#if JUCE_MSVC
#if JUCE_WINDOWS && ! JUCE_MINGW
typedef pointer_sized_int ssize_t;
#endif

2
modules/juce_core/memory/juce_Atomic.h
View file

@ -207,7 +207,7 @@ private:
#endif
//==============================================================================
#elif JUCE_GCC || JUCE_CLANG
#elif (JUCE_GCC || JUCE_CLANG) && ! JUCE_WINDOWS
#define JUCE_ATOMICS_GCC 1 // GCC with intrinsics
#if JUCE_IOS || JUCE_ANDROID // (64-bit ops will compile but not link on these mobile OSes)

6
modules/juce_core/text/juce_CharPointer_ASCII.h
View file

@ -276,10 +276,10 @@ public:
int compareIgnoreCase (const CharPointer_ASCII other) const
{
#if JUCE_MSVC
return stricmp (data, other.data);
#elif JUCE_MINGW
#if JUCE_MINGW
return CharacterFunctions::compareIgnoreCase (*this, other);
#elif JUCE_WINDOWS
return stricmp (data, other.data);
#else
return strcasecmp (data, other.data);
#endif

6
modules/juce_core/text/juce_CharPointer_UTF8.h
View file

@ -420,10 +420,10 @@ public:
/** Compares this string with another one. */
int compareIgnoreCase (const CharPointer_UTF8 other) const noexcept
{
#if JUCE_MSVC
return stricmp (data, other.data);
#elif JUCE_MINGW
#if JUCE_MINGW
return CharacterFunctions::compareIgnoreCase (*this, other);
#elif JUCE_WINDOWS
return stricmp (data, other.data);
#else
return strcasecmp (data, other.data);
#endif