From 265fb0e8ebc26e1469d6edcc68d2ca9acefeb508 Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 16 Jun 2013 10:46:51 +0100 Subject: [PATCH] More MSVC warning fixes. --- modules/juce_gui_basics/drawables/juce_DrawableText.cpp | 2 +- .../juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp | 2 +- modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp | 2 +- modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/juce_gui_basics/drawables/juce_DrawableText.cpp b/modules/juce_gui_basics/drawables/juce_DrawableText.cpp index 742cee1a03..1edc6cccc4 100644 --- a/modules/juce_gui_basics/drawables/juce_DrawableText.cpp +++ b/modules/juce_gui_basics/drawables/juce_DrawableText.cpp @@ -172,7 +172,7 @@ void DrawableText::paint (Graphics& g) g.setFont (scaledFont); g.setColour (colour); - g.drawFittedText (text, Rectangle (w, h), justification, 0x100000); + g.drawFittedText (text, Rectangle (w, h).getSmallestIntegerContainer(), justification, 0x100000); } Rectangle DrawableText::getDrawableBounds() const diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp index c4e79c423d..c1448135d2 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp @@ -49,7 +49,7 @@ public: void paint (Graphics& g) { text.draw (g, getLocalBounds().reduced (6) - .removeFromTop (text.getHeight()).toFloat()); + .removeFromTop ((int) text.getHeight()).toFloat()); } void resized() diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp index 387ae34b55..a1584e0b1d 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp @@ -2207,7 +2207,7 @@ void LookAndFeel::drawTabButtonText (TabBarButton& button, Graphics& g, bool isM g.addTransform (t); g.drawFittedText (button.getButtonText().trim(), - 0.0f, 0.0f, (float) length, (float) depth, + 0, 0, (int) length, (int) depth, Justification::centred, jmax (1, ((int) depth) / 12)); } diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp index e0e262b2a1..d2fb441efe 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp +++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp @@ -110,7 +110,7 @@ public: column += token.length; } - as.draw (g, Rectangle (x, y, 10000.0f, (float) lineH)); + as.draw (g, Rectangle (x, (float) y, 10000.0f, (float) lineH)); } private: