| @@ -29,6 +29,12 @@ Drawable::Drawable() | |||||
| setPaintingIsUnclipped (true); | setPaintingIsUnclipped (true); | ||||
| } | } | ||||
| Drawable::Drawable (const Drawable& other) | |||||
| { | |||||
| setName (other.getName()); | |||||
| setComponentID (other.getComponentID()); | |||||
| } | |||||
| Drawable::~Drawable() | Drawable::~Drawable() | ||||
| { | { | ||||
| } | } | ||||
| @@ -207,11 +207,11 @@ protected: | |||||
| friend class DrawableShape; | friend class DrawableShape; | ||||
| /** @internal */ | /** @internal */ | ||||
| void transformContextToCorrectOrigin (Graphics& g); | |||||
| void transformContextToCorrectOrigin (Graphics&); | |||||
| /** @internal */ | /** @internal */ | ||||
| void parentHierarchyChanged(); | void parentHierarchyChanged(); | ||||
| /** @internal */ | /** @internal */ | ||||
| void setBoundsToEnclose (const Rectangle<float>& area); | |||||
| void setBoundsToEnclose (const Rectangle<float>&); | |||||
| Point<int> originRelativeToComponent; | Point<int> originRelativeToComponent; | ||||
| @@ -243,12 +243,15 @@ protected: | |||||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Positioner); | JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Positioner); | ||||
| }; | }; | ||||
| Drawable (const Drawable&); | |||||
| #endif | #endif | ||||
| private: | private: | ||||
| void nonConstDraw (Graphics& g, float opacity, const AffineTransform& transform); | void nonConstDraw (Graphics& g, float opacity, const AffineTransform& transform); | ||||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Drawable); | |||||
| Drawable& operator= (const Drawable&); | |||||
| JUCE_LEAK_DETECTOR (Drawable); | |||||
| }; | }; | ||||
| @@ -34,7 +34,8 @@ DrawableComposite::DrawableComposite() | |||||
| } | } | ||||
| DrawableComposite::DrawableComposite (const DrawableComposite& other) | DrawableComposite::DrawableComposite (const DrawableComposite& other) | ||||
| : bounds (other.bounds), | |||||
| : Drawable (other), | |||||
| bounds (other.bounds), | |||||
| markersX (other.markersX), | markersX (other.markersX), | ||||
| markersY (other.markersY), | markersY (other.markersY), | ||||
| updateBoundsReentrant (false) | updateBoundsReentrant (false) | ||||
| @@ -32,7 +32,8 @@ DrawableImage::DrawableImage() | |||||
| } | } | ||||
| DrawableImage::DrawableImage (const DrawableImage& other) | DrawableImage::DrawableImage (const DrawableImage& other) | ||||
| : image (other.image), | |||||
| : Drawable (other), | |||||
| image (other.image), | |||||
| opacity (other.opacity), | opacity (other.opacity), | ||||
| overlayColour (other.overlayColour), | overlayColour (other.overlayColour), | ||||
| bounds (other.bounds) | bounds (other.bounds) | ||||
| @@ -31,7 +31,8 @@ DrawableShape::DrawableShape() | |||||
| } | } | ||||
| DrawableShape::DrawableShape (const DrawableShape& other) | DrawableShape::DrawableShape (const DrawableShape& other) | ||||
| : strokeType (other.strokeType), | |||||
| : Drawable (other), | |||||
| strokeType (other.strokeType), | |||||
| mainFill (other.mainFill), | mainFill (other.mainFill), | ||||
| strokeFill (other.strokeFill) | strokeFill (other.strokeFill) | ||||
| { | { | ||||
| @@ -34,7 +34,8 @@ DrawableText::DrawableText() | |||||
| } | } | ||||
| DrawableText::DrawableText (const DrawableText& other) | DrawableText::DrawableText (const DrawableText& other) | ||||
| : bounds (other.bounds), | |||||
| : Drawable (other), | |||||
| bounds (other.bounds), | |||||
| fontHeight (other.fontHeight), | fontHeight (other.fontHeight), | ||||
| fontHScale (other.fontHScale), | fontHScale (other.fontHScale), | ||||
| font (other.font), | font (other.font), | ||||