diff --git a/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableDocument.cpp b/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableDocument.cpp index 83103559ce..dedc7e47ee 100644 --- a/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableDocument.cpp +++ b/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableDocument.cpp @@ -373,7 +373,7 @@ const Image DrawableDocument::getImageForIdentifier (const var& imageIdentifier) g.drawRect (0, 0, 128, 128); for (int i = -128; i < 128; i += 16) - g.drawLine (i, 0, i + 128, 128); + g.drawLine ((float) i, 0.0f, i + 128.0f, 128.0f); g.setColour (Colours::darkgrey); g.drawRect (0, 0, 128, 128); diff --git a/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableTypeHandler.cpp b/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableTypeHandler.cpp index 734b0adca1..c00d003b40 100644 --- a/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableTypeHandler.cpp +++ b/extras/Jucer (experimental)/Source/model/Drawable/jucer_DrawableTypeHandler.cpp @@ -689,8 +689,8 @@ public: RelativePoint topRight (wrapper.getTargetPositionForTopRight()); RelativePoint bottomLeft (wrapper.getTargetPositionForBottomLeft()); - topRight.moveToAbsolute (topLeft.resolve (&item) + Point (im.getWidth(), 0.0f), &item); - bottomLeft.moveToAbsolute (topLeft.resolve (&item) + Point (0.0f, im.getHeight()), &item); + topRight.moveToAbsolute (topLeft.resolve (&item) + Point ((float) im.getWidth(), 0.0f), &item); + bottomLeft.moveToAbsolute (topLeft.resolve (&item) + Point (0.0f, (float) im.getHeight()), &item); wrapper.setTargetPositionForTopRight (topRight, item.getDocument().getUndoManager()); wrapper.setTargetPositionForBottomLeft (bottomLeft, item.getDocument().getUndoManager()); diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 8398b7ad42..3acf3f1126 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -240264,7 +240264,7 @@ private: eventMods = eventMods.withoutMouseButtons(); const MouseEvent e (Desktop::getInstance().getMainMouseSource(), - Point(), eventMods, component, getMouseEventTime(), + Point(), eventMods, component, component, getMouseEventTime(), Point(), getMouseEventTime(), 1, false); if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN) @@ -264047,7 +264047,7 @@ public: if (lastClipRectIsValid) { lastClipRect = lastClipRect.getIntersection (r); - return ! r.isEmpty(); + return ! lastClipRect.isEmpty(); } return ! isClipEmpty(); @@ -268686,7 +268686,7 @@ public: if (lastClipRectIsValid) { lastClipRect = lastClipRect.getIntersection (r); - return ! r.isEmpty(); + return ! lastClipRect.isEmpty(); } return ! isClipEmpty(); diff --git a/juce_amalgamated.h b/juce_amalgamated.h index 432474c90d..bded67f237 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -54104,7 +54104,7 @@ public: } /** True if this item is currently selected. */ - bool isSelected (const ParameterType item) const throw() + bool isSelected (ParameterType item) const throw() { return selectedItems.contains (item); } @@ -58312,7 +58312,7 @@ public: DrawableComposite (const DrawableComposite& other); /** Destructor. */ - virtual ~DrawableComposite(); + ~DrawableComposite(); /** Adds a new sub-drawable to this one. @@ -58530,7 +58530,7 @@ public: DrawableImage (const DrawableImage& other); /** Destructor. */ - virtual ~DrawableImage(); + ~DrawableImage(); /** Sets the image that this drawable will render. */ void setImage (const Image& imageToUse); @@ -58677,7 +58677,7 @@ public: DrawablePath (const DrawablePath& other); /** Destructor. */ - virtual ~DrawablePath(); + ~DrawablePath(); /** Changes the path that will be drawn. @@ -58842,7 +58842,7 @@ public: DrawableText (const DrawableText& other); /** Destructor. */ - virtual ~DrawableText(); + ~DrawableText(); /** Sets the text to display.*/ void setText (const String& newText); diff --git a/src/gui/graphics/drawables/juce_DrawableComposite.h b/src/gui/graphics/drawables/juce_DrawableComposite.h index 940424ebd5..ffdcc0a241 100644 --- a/src/gui/graphics/drawables/juce_DrawableComposite.h +++ b/src/gui/graphics/drawables/juce_DrawableComposite.h @@ -47,7 +47,7 @@ public: DrawableComposite (const DrawableComposite& other); /** Destructor. */ - virtual ~DrawableComposite(); + ~DrawableComposite(); //============================================================================== /** Adds a new sub-drawable to this one. diff --git a/src/gui/graphics/drawables/juce_DrawableImage.h b/src/gui/graphics/drawables/juce_DrawableImage.h index d0b4d6bb99..be688ce967 100644 --- a/src/gui/graphics/drawables/juce_DrawableImage.h +++ b/src/gui/graphics/drawables/juce_DrawableImage.h @@ -44,7 +44,7 @@ public: DrawableImage (const DrawableImage& other); /** Destructor. */ - virtual ~DrawableImage(); + ~DrawableImage(); //============================================================================== /** Sets the image that this drawable will render. */ diff --git a/src/gui/graphics/drawables/juce_DrawablePath.h b/src/gui/graphics/drawables/juce_DrawablePath.h index c81caa5fc4..953e63e8e9 100644 --- a/src/gui/graphics/drawables/juce_DrawablePath.h +++ b/src/gui/graphics/drawables/juce_DrawablePath.h @@ -46,7 +46,7 @@ public: DrawablePath (const DrawablePath& other); /** Destructor. */ - virtual ~DrawablePath(); + ~DrawablePath(); //============================================================================== /** Changes the path that will be drawn. diff --git a/src/gui/graphics/drawables/juce_DrawableText.h b/src/gui/graphics/drawables/juce_DrawableText.h index f41705f597..9073f9c1b6 100644 --- a/src/gui/graphics/drawables/juce_DrawableText.h +++ b/src/gui/graphics/drawables/juce_DrawableText.h @@ -45,7 +45,7 @@ public: DrawableText (const DrawableText& other); /** Destructor. */ - virtual ~DrawableText(); + ~DrawableText(); //============================================================================== /** Sets the text to display.*/ diff --git a/src/native/mac/juce_mac_CoreGraphicsContext.mm b/src/native/mac/juce_mac_CoreGraphicsContext.mm index 9bb62e4016..f73d84abc7 100644 --- a/src/native/mac/juce_mac_CoreGraphicsContext.mm +++ b/src/native/mac/juce_mac_CoreGraphicsContext.mm @@ -187,7 +187,7 @@ public: if (lastClipRectIsValid) { lastClipRect = lastClipRect.getIntersection (r); - return ! r.isEmpty(); + return ! lastClipRect.isEmpty(); } return ! isClipEmpty(); diff --git a/src/native/windows/juce_win32_Windowing.cpp b/src/native/windows/juce_win32_Windowing.cpp index f82b03886c..e840802df7 100644 --- a/src/native/windows/juce_win32_Windowing.cpp +++ b/src/native/windows/juce_win32_Windowing.cpp @@ -1931,7 +1931,7 @@ private: eventMods = eventMods.withoutMouseButtons(); const MouseEvent e (Desktop::getInstance().getMainMouseSource(), - Point(), eventMods, component, getMouseEventTime(), + Point(), eventMods, component, component, getMouseEventTime(), Point(), getMouseEventTime(), 1, false); if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN) diff --git a/src/utilities/juce_SelectedItemSet.h b/src/utilities/juce_SelectedItemSet.h index 3cd7551962..771939b1c9 100644 --- a/src/utilities/juce_SelectedItemSet.h +++ b/src/utilities/juce_SelectedItemSet.h @@ -279,7 +279,7 @@ public: } /** True if this item is currently selected. */ - bool isSelected (const ParameterType item) const throw() + bool isSelected (ParameterType item) const throw() { return selectedItems.contains (item); }