mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-18 00:54:19 +00:00
Code Activity

Fix for some MSVC compile problems and warnings.

Browse source
This commit is contained in:
Julian Storer 2010-02-04 18:42:02 +00:00
parent f7636fe1a3
commit effe92f6e7
6 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
juce_amalgamated.cpp
View file

@ -560,6 +560,9 @@ public:
//==============================================================================
#define DONT_SET_USING_JUCE_NAMESPACE 1
#undef max
#undef min
#include "juce_amalgamated.h"
#define NO_DUMMY_DECL
@ -64381,7 +64384,7 @@ void LookAndFeel::drawToggleButton (Graphics& g,
if (! button.isEnabled())
g.setOpacity (0.5f);
const int textX = tickWidth + 5;
const int textX = (int) tickWidth + 5;
g.drawFittedText (button.getButtonText(),
textX, 0,
@ -71659,7 +71662,7 @@ public:
bool enabled = deviceManager.isMidiInputEnabled (item);
const int x = getTickX();
const int tickW = height - height / 4;
const float tickW = height * 0.75f;
getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
enabled, true, true, false);
@ -72316,7 +72319,7 @@ public:
}
const int x = getTickX();
const int tickW = height - height / 4;
const float tickW = height * 0.75f;
getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
enabled, true, true, false);

1
juce_amalgamated.h
View file

@ -471,6 +471,7 @@
#include <cstdlib>
#include <cstdarg>
#include <climits>
#include <limits>
#include <cmath>
#include <cwchar>
#include <stdexcept>

1
src/core/juce_StandardHeader.h
View file

@ -71,6 +71,7 @@
#include <cstdlib>
#include <cstdarg>
#include <climits>
#include <limits>
#include <cmath>
#include <cwchar>
#include <stdexcept>

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

@ -470,7 +470,7 @@ void LookAndFeel::drawToggleButton (Graphics& g,
if (! button.isEnabled())
g.setOpacity (0.5f);
const int textX = tickWidth + 5;
const int textX = (int) tickWidth + 5;
g.drawFittedText (button.getButtonText(),
textX, 0,

4
src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
View file

@ -122,7 +122,7 @@ public:
bool enabled = deviceManager.isMidiInputEnabled (item);
const int x = getTickX();
const int tickW = height - height / 4;
const float tickW = height * 0.75f;
getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
enabled, true, true, false);
@ -783,7 +783,7 @@ public:
}
const int x = getTickX();
const int tickW = height - height / 4;
const float tickW = height * 0.75f;
getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
enabled, true, true, false);

3
src/juce_amalgamated_template.cpp
View file

@ -55,6 +55,9 @@
//==============================================================================
#define DONT_SET_USING_JUCE_NAMESPACE 1
#undef max
#undef min
#include "../juce_amalgamated.h"
#define NO_DUMMY_DECL