| @@ -373,7 +373,7 @@ const Image DrawableDocument::getImageForIdentifier (const var& imageIdentifier) | |||||
| g.drawRect (0, 0, 128, 128); | g.drawRect (0, 0, 128, 128); | ||||
| for (int i = -128; i < 128; i += 16) | 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.setColour (Colours::darkgrey); | ||||
| g.drawRect (0, 0, 128, 128); | g.drawRect (0, 0, 128, 128); | ||||
| @@ -689,8 +689,8 @@ public: | |||||
| RelativePoint topRight (wrapper.getTargetPositionForTopRight()); | RelativePoint topRight (wrapper.getTargetPositionForTopRight()); | ||||
| RelativePoint bottomLeft (wrapper.getTargetPositionForBottomLeft()); | RelativePoint bottomLeft (wrapper.getTargetPositionForBottomLeft()); | ||||
| topRight.moveToAbsolute (topLeft.resolve (&item) + Point<float> (im.getWidth(), 0.0f), &item); | |||||
| bottomLeft.moveToAbsolute (topLeft.resolve (&item) + Point<float> (0.0f, im.getHeight()), &item); | |||||
| topRight.moveToAbsolute (topLeft.resolve (&item) + Point<float> ((float) im.getWidth(), 0.0f), &item); | |||||
| bottomLeft.moveToAbsolute (topLeft.resolve (&item) + Point<float> (0.0f, (float) im.getHeight()), &item); | |||||
| wrapper.setTargetPositionForTopRight (topRight, item.getDocument().getUndoManager()); | wrapper.setTargetPositionForTopRight (topRight, item.getDocument().getUndoManager()); | ||||
| wrapper.setTargetPositionForBottomLeft (bottomLeft, item.getDocument().getUndoManager()); | wrapper.setTargetPositionForBottomLeft (bottomLeft, item.getDocument().getUndoManager()); | ||||
| @@ -240264,7 +240264,7 @@ private: | |||||
| eventMods = eventMods.withoutMouseButtons(); | eventMods = eventMods.withoutMouseButtons(); | ||||
| const MouseEvent e (Desktop::getInstance().getMainMouseSource(), | const MouseEvent e (Desktop::getInstance().getMainMouseSource(), | ||||
| Point<int>(), eventMods, component, getMouseEventTime(), | |||||
| Point<int>(), eventMods, component, component, getMouseEventTime(), | |||||
| Point<int>(), getMouseEventTime(), 1, false); | Point<int>(), getMouseEventTime(), 1, false); | ||||
| if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN) | if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN) | ||||
| @@ -264047,7 +264047,7 @@ public: | |||||
| if (lastClipRectIsValid) | if (lastClipRectIsValid) | ||||
| { | { | ||||
| lastClipRect = lastClipRect.getIntersection (r); | lastClipRect = lastClipRect.getIntersection (r); | ||||
| return ! r.isEmpty(); | |||||
| return ! lastClipRect.isEmpty(); | |||||
| } | } | ||||
| return ! isClipEmpty(); | return ! isClipEmpty(); | ||||
| @@ -268686,7 +268686,7 @@ public: | |||||
| if (lastClipRectIsValid) | if (lastClipRectIsValid) | ||||
| { | { | ||||
| lastClipRect = lastClipRect.getIntersection (r); | lastClipRect = lastClipRect.getIntersection (r); | ||||
| return ! r.isEmpty(); | |||||
| return ! lastClipRect.isEmpty(); | |||||
| } | } | ||||
| return ! isClipEmpty(); | return ! isClipEmpty(); | ||||
| @@ -54104,7 +54104,7 @@ public: | |||||
| } | } | ||||
| /** True if this item is currently selected. */ | /** True if this item is currently selected. */ | ||||
| bool isSelected (const ParameterType item) const throw() | |||||
| bool isSelected (ParameterType item) const throw() | |||||
| { | { | ||||
| return selectedItems.contains (item); | return selectedItems.contains (item); | ||||
| } | } | ||||
| @@ -58312,7 +58312,7 @@ public: | |||||
| DrawableComposite (const DrawableComposite& other); | DrawableComposite (const DrawableComposite& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawableComposite(); | |||||
| ~DrawableComposite(); | |||||
| /** Adds a new sub-drawable to this one. | /** Adds a new sub-drawable to this one. | ||||
| @@ -58530,7 +58530,7 @@ public: | |||||
| DrawableImage (const DrawableImage& other); | DrawableImage (const DrawableImage& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawableImage(); | |||||
| ~DrawableImage(); | |||||
| /** Sets the image that this drawable will render. */ | /** Sets the image that this drawable will render. */ | ||||
| void setImage (const Image& imageToUse); | void setImage (const Image& imageToUse); | ||||
| @@ -58677,7 +58677,7 @@ public: | |||||
| DrawablePath (const DrawablePath& other); | DrawablePath (const DrawablePath& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawablePath(); | |||||
| ~DrawablePath(); | |||||
| /** Changes the path that will be drawn. | /** Changes the path that will be drawn. | ||||
| @@ -58842,7 +58842,7 @@ public: | |||||
| DrawableText (const DrawableText& other); | DrawableText (const DrawableText& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawableText(); | |||||
| ~DrawableText(); | |||||
| /** Sets the text to display.*/ | /** Sets the text to display.*/ | ||||
| void setText (const String& newText); | void setText (const String& newText); | ||||
| @@ -47,7 +47,7 @@ public: | |||||
| DrawableComposite (const DrawableComposite& other); | DrawableComposite (const DrawableComposite& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawableComposite(); | |||||
| ~DrawableComposite(); | |||||
| //============================================================================== | //============================================================================== | ||||
| /** Adds a new sub-drawable to this one. | /** Adds a new sub-drawable to this one. | ||||
| @@ -44,7 +44,7 @@ public: | |||||
| DrawableImage (const DrawableImage& other); | DrawableImage (const DrawableImage& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawableImage(); | |||||
| ~DrawableImage(); | |||||
| //============================================================================== | //============================================================================== | ||||
| /** Sets the image that this drawable will render. */ | /** Sets the image that this drawable will render. */ | ||||
| @@ -46,7 +46,7 @@ public: | |||||
| DrawablePath (const DrawablePath& other); | DrawablePath (const DrawablePath& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawablePath(); | |||||
| ~DrawablePath(); | |||||
| //============================================================================== | //============================================================================== | ||||
| /** Changes the path that will be drawn. | /** Changes the path that will be drawn. | ||||
| @@ -45,7 +45,7 @@ public: | |||||
| DrawableText (const DrawableText& other); | DrawableText (const DrawableText& other); | ||||
| /** Destructor. */ | /** Destructor. */ | ||||
| virtual ~DrawableText(); | |||||
| ~DrawableText(); | |||||
| //============================================================================== | //============================================================================== | ||||
| /** Sets the text to display.*/ | /** Sets the text to display.*/ | ||||
| @@ -187,7 +187,7 @@ public: | |||||
| if (lastClipRectIsValid) | if (lastClipRectIsValid) | ||||
| { | { | ||||
| lastClipRect = lastClipRect.getIntersection (r); | lastClipRect = lastClipRect.getIntersection (r); | ||||
| return ! r.isEmpty(); | |||||
| return ! lastClipRect.isEmpty(); | |||||
| } | } | ||||
| return ! isClipEmpty(); | return ! isClipEmpty(); | ||||
| @@ -1931,7 +1931,7 @@ private: | |||||
| eventMods = eventMods.withoutMouseButtons(); | eventMods = eventMods.withoutMouseButtons(); | ||||
| const MouseEvent e (Desktop::getInstance().getMainMouseSource(), | const MouseEvent e (Desktop::getInstance().getMainMouseSource(), | ||||
| Point<int>(), eventMods, component, getMouseEventTime(), | |||||
| Point<int>(), eventMods, component, component, getMouseEventTime(), | |||||
| Point<int>(), getMouseEventTime(), 1, false); | Point<int>(), getMouseEventTime(), 1, false); | ||||
| if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN) | if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN) | ||||
| @@ -279,7 +279,7 @@ public: | |||||
| } | } | ||||
| /** True if this item is currently selected. */ | /** True if this item is currently selected. */ | ||||
| bool isSelected (const ParameterType item) const throw() | |||||
| bool isSelected (ParameterType item) const throw() | |||||
| { | { | ||||
| return selectedItems.contains (item); | return selectedItems.contains (item); | ||||
| } | } | ||||