mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00
Code Activity

Updated a method name in Drawable to avoid overloading conflicts

Browse source
This commit is contained in:
Julian Storer 2009-08-27 17:03:59 +01:00
parent 955043fb48
commit 21816056c3
13 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj
View file

@ -51,7 +51,7 @@
847F4E9C0E8BA9C300F64426 /* FontsAndTextDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontsAndTextDemo.cpp; path = ../../src/demos/FontsAndTextDemo.cpp; sourceTree = SOURCE_ROOT; };
847F4E9D0E8BA9C300F64426 /* InterprocessCommsDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InterprocessCommsDemo.cpp; path = ../../src/demos/InterprocessCommsDemo.cpp; sourceTree = SOURCE_ROOT; };
847F4E9E0E8BA9C300F64426 /* OpenGLDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenGLDemo.cpp; path = ../../src/demos/OpenGLDemo.cpp; sourceTree = SOURCE_ROOT; };
847F4E9F0E8BA9C300F64426 /* PathsAndTransformsDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PathsAndTransformsDemo.cpp; path = ../../src/demos/PathsAndTransformsDemo.cpp; sourceTree = SOURCE_ROOT; };
847F4E9F0E8BA9C300F64426 /* PathsAndTransformsDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = PathsAndTransformsDemo.cpp; path = ../../src/demos/PathsAndTransformsDemo.cpp; sourceTree = SOURCE_ROOT; };
847F4EA00E8BA9C300F64426 /* QuickTimeDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = QuickTimeDemo.cpp; path = ../../src/demos/QuickTimeDemo.cpp; sourceTree = SOURCE_ROOT; };
847F4EA10E8BA9C300F64426 /* TableDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TableDemo.cpp; path = ../../src/demos/TableDemo.cpp; sourceTree = SOURCE_ROOT; };
847F4EA20E8BA9C300F64426 /* ThreadingDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadingDemo.cpp; path = ../../src/demos/ThreadingDemo.cpp; sourceTree = SOURCE_ROOT; };

16
juce_amalgamated.cpp
View file

@ -79860,7 +79860,7 @@ void Drawable::draw (Graphics& g,
const AffineTransform& transform) const
{
const RenderingContext context (g, transform, g.getCurrentColour().getFloatAlpha());
draw (context);
render (context);
}
void Drawable::drawAt (Graphics& g, const float x, const float y) const
@ -80002,7 +80002,7 @@ void DrawableComposite::bringToFront (const int index)
}
}
void DrawableComposite::draw (const Drawable::RenderingContext& context) const
void DrawableComposite::render (const Drawable::RenderingContext& context) const
{
if (drawables.size() > 1)
{
@ -80016,7 +80016,7 @@ void DrawableComposite::draw (const Drawable::RenderingContext& context) const
contextCopy.transform = (t == 0) ? context.transform
: t->followedBy (context.transform);
drawables.getUnchecked(i)->draw (context);
drawables.getUnchecked(i)->render (context);
}
}
else
@ -80031,7 +80031,7 @@ void DrawableComposite::draw (const Drawable::RenderingContext& context) const
Graphics tempG (tempImage);
tempG.setOrigin (-clipBounds.getX(), -clipBounds.getY());
Drawable::RenderingContext tempContext (tempG, context.transform, 1.0f);
draw (tempContext);
render (tempContext);
}
context.g.setOpacity (context.opacity);
@ -80040,7 +80040,7 @@ void DrawableComposite::draw (const Drawable::RenderingContext& context) const
}
else if (drawables.size() > 0)
{
drawables.getUnchecked(0)->draw (context);
drawables.getUnchecked(0)->render (context);
}
}
@ -80161,7 +80161,7 @@ void DrawableImage::setOverlayColour (const Colour& newOverlayColour)
overlayColour = newOverlayColour;
}
void DrawableImage::draw (const Drawable::RenderingContext& context) const
void DrawableImage::render (const Drawable::RenderingContext& context) const
{
if (image != 0)
{
@ -80284,7 +80284,7 @@ void DrawablePath::setOutline (const PathStrokeType& strokeType_, const Brush& n
updateOutline();
}
void DrawablePath::draw (const Drawable::RenderingContext& context) const
void DrawablePath::render (const Drawable::RenderingContext& context) const
{
{
Brush* const tempBrush = fillBrush->createCopy();
@ -80375,7 +80375,7 @@ void DrawableText::setColour (const Colour& newColour)
colour = newColour;
}
void DrawableText::draw (const Drawable::RenderingContext& context) const
void DrawableText::render (const Drawable::RenderingContext& context) const
{
context.g.setColour (colour.withMultipliedAlpha (context.opacity));
text.draw (context.g, context.transform);

12
juce_amalgamated.h
View file

@ -41203,9 +41203,9 @@ public:
};
/** Renders this Drawable object.
@see drawWithin
@see draw
*/
virtual void draw (const RenderingContext& context) const = 0;
virtual void render (const RenderingContext& context) const = 0;
/** Returns the smallest rectangle that can contain this Drawable object.
@ -41375,7 +41375,7 @@ public:
void bringToFront (const int index);
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */
@ -41470,7 +41470,7 @@ public:
const Colour& getOverlayColour() const throw() { return overlayColour; }
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */
@ -41570,7 +41570,7 @@ public:
Brush* getOutlineBrush() const throw() { return strokeBrush; }
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */
@ -41638,7 +41638,7 @@ public:
const Colour& getColour() const throw() { return colour; }
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */

2
src/gui/graphics/drawables/juce_Drawable.cpp
View file

@ -56,7 +56,7 @@ void Drawable::draw (Graphics& g,
const AffineTransform& transform) const
{
const RenderingContext context (g, transform, g.getCurrentColour().getFloatAlpha());
draw (context);
render (context);
}
void Drawable::drawAt (Graphics& g, const float x, const float y) const

4
src/gui/graphics/drawables/juce_Drawable.h
View file

@ -114,9 +114,9 @@ public:
};
/** Renders this Drawable object.
@see drawWithin
@see draw
*/
virtual void draw (const RenderingContext& context) const = 0;
virtual void render (const RenderingContext& context) const = 0;
//==============================================================================
/** Returns the smallest rectangle that can contain this Drawable object.

8
src/gui/graphics/drawables/juce_DrawableComposite.cpp
View file

@ -84,7 +84,7 @@ void DrawableComposite::bringToFront (const int index)
}
}
void DrawableComposite::draw (const Drawable::RenderingContext& context) const
void DrawableComposite::render (const Drawable::RenderingContext& context) const
{
if (drawables.size() > 1)
{
@ -98,7 +98,7 @@ void DrawableComposite::draw (const Drawable::RenderingContext& context) const
contextCopy.transform = (t == 0) ? context.transform
: t->followedBy (context.transform);
drawables.getUnchecked(i)->draw (context);
drawables.getUnchecked(i)->render (context);
}
}
else
@ -113,7 +113,7 @@ void DrawableComposite::draw (const Drawable::RenderingContext& context) const
Graphics tempG (tempImage);
tempG.setOrigin (-clipBounds.getX(), -clipBounds.getY());
Drawable::RenderingContext tempContext (tempG, context.transform, 1.0f);
draw (tempContext);
render (tempContext);
}
context.g.setOpacity (context.opacity);
@ -122,7 +122,7 @@ void DrawableComposite::draw (const Drawable::RenderingContext& context) const
}
else if (drawables.size() > 0)
{
drawables.getUnchecked(0)->draw (context);
drawables.getUnchecked(0)->render (context);
}
}

2
src/gui/graphics/drawables/juce_DrawableComposite.h
View file

@ -130,7 +130,7 @@ public:
//==============================================================================
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */

2
src/gui/graphics/drawables/juce_DrawableImage.cpp
View file

@ -86,7 +86,7 @@ void DrawableImage::setOverlayColour (const Colour& newOverlayColour)
}
//==============================================================================
void DrawableImage::draw (const Drawable::RenderingContext& context) const
void DrawableImage::render (const Drawable::RenderingContext& context) const
{
if (image != 0)
{

2
src/gui/graphics/drawables/juce_DrawableImage.h
View file

@ -100,7 +100,7 @@ public:
//==============================================================================
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */

2
src/gui/graphics/drawables/juce_DrawablePath.cpp
View file

@ -83,7 +83,7 @@ void DrawablePath::setOutline (const PathStrokeType& strokeType_, const Brush& n
//==============================================================================
void DrawablePath::draw (const Drawable::RenderingContext& context) const
void DrawablePath::render (const Drawable::RenderingContext& context) const
{
{
Brush* const tempBrush = fillBrush->createCopy();

2
src/gui/graphics/drawables/juce_DrawablePath.h
View file

@ -104,7 +104,7 @@ public:
//==============================================================================
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */

2
src/gui/graphics/drawables/juce_DrawableText.cpp
View file

@ -59,7 +59,7 @@ void DrawableText::setColour (const Colour& newColour)
}
//==============================================================================
void DrawableText::draw (const Drawable::RenderingContext& context) const
void DrawableText::render (const Drawable::RenderingContext& context) const
{
context.g.setColour (colour.withMultipliedAlpha (context.opacity));
text.draw (context.g, context.transform);

2
src/gui/graphics/drawables/juce_DrawableText.h
View file

@ -70,7 +70,7 @@ public:
//==============================================================================
/** @internal */
void draw (const Drawable::RenderingContext& context) const;
void render (const Drawable::RenderingContext& context) const;
/** @internal */
void getBounds (float& x, float& y, float& width, float& height) const;
/** @internal */