From 21816056c35fa4b11d60eb4f9f3fd5526cc884ee Mon Sep 17 00:00:00 2001
From: Julian Storer <jules@BigMac.local>
Date: Thu, 27 Aug 2009 17:03:59 +0100
Subject: [PATCH] Updated a method name in Drawable to avoid overloading
 conflicts

---
 .../macosx/jucedemo.xcodeproj/project.pbxproj    |  2 +-
 juce_amalgamated.cpp                             | 16 ++++++++--------
 juce_amalgamated.h                               | 12 ++++++------
 src/gui/graphics/drawables/juce_Drawable.cpp     |  2 +-
 src/gui/graphics/drawables/juce_Drawable.h       |  4 ++--
 .../drawables/juce_DrawableComposite.cpp         |  8 ++++----
 .../graphics/drawables/juce_DrawableComposite.h  |  2 +-
 .../graphics/drawables/juce_DrawableImage.cpp    |  2 +-
 src/gui/graphics/drawables/juce_DrawableImage.h  |  2 +-
 src/gui/graphics/drawables/juce_DrawablePath.cpp |  2 +-
 src/gui/graphics/drawables/juce_DrawablePath.h   |  2 +-
 src/gui/graphics/drawables/juce_DrawableText.cpp |  2 +-
 src/gui/graphics/drawables/juce_DrawableText.h   |  2 +-
 13 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj b/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj
index 710a127f30..2145e641fa 100644
--- a/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj	
+++ b/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj	
@@ -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; };
diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 4936941726..1af7e3a797 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -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);
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index cf173cf3b8..099145564b 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -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 */
diff --git a/src/gui/graphics/drawables/juce_Drawable.cpp b/src/gui/graphics/drawables/juce_Drawable.cpp
index 9c927921df..f0d0282d8e 100644
--- a/src/gui/graphics/drawables/juce_Drawable.cpp
+++ b/src/gui/graphics/drawables/juce_Drawable.cpp
@@ -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
diff --git a/src/gui/graphics/drawables/juce_Drawable.h b/src/gui/graphics/drawables/juce_Drawable.h
index f7ebf5f8d6..f9bcfb7cd1 100644
--- a/src/gui/graphics/drawables/juce_Drawable.h
+++ b/src/gui/graphics/drawables/juce_Drawable.h
@@ -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.
diff --git a/src/gui/graphics/drawables/juce_DrawableComposite.cpp b/src/gui/graphics/drawables/juce_DrawableComposite.cpp
index ff7667b50f..7d1799ada9 100644
--- a/src/gui/graphics/drawables/juce_DrawableComposite.cpp
+++ b/src/gui/graphics/drawables/juce_DrawableComposite.cpp
@@ -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);
     }
 }
 
diff --git a/src/gui/graphics/drawables/juce_DrawableComposite.h b/src/gui/graphics/drawables/juce_DrawableComposite.h
index 9608a2513e..6a70ab7cc6 100644
--- a/src/gui/graphics/drawables/juce_DrawableComposite.h
+++ b/src/gui/graphics/drawables/juce_DrawableComposite.h
@@ -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 */
diff --git a/src/gui/graphics/drawables/juce_DrawableImage.cpp b/src/gui/graphics/drawables/juce_DrawableImage.cpp
index f51aa11b10..95f92316fc 100644
--- a/src/gui/graphics/drawables/juce_DrawableImage.cpp
+++ b/src/gui/graphics/drawables/juce_DrawableImage.cpp
@@ -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)
     {
diff --git a/src/gui/graphics/drawables/juce_DrawableImage.h b/src/gui/graphics/drawables/juce_DrawableImage.h
index e17bb58404..649763cc1b 100644
--- a/src/gui/graphics/drawables/juce_DrawableImage.h
+++ b/src/gui/graphics/drawables/juce_DrawableImage.h
@@ -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 */
diff --git a/src/gui/graphics/drawables/juce_DrawablePath.cpp b/src/gui/graphics/drawables/juce_DrawablePath.cpp
index b06096cf20..a195d75b6e 100644
--- a/src/gui/graphics/drawables/juce_DrawablePath.cpp
+++ b/src/gui/graphics/drawables/juce_DrawablePath.cpp
@@ -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();
diff --git a/src/gui/graphics/drawables/juce_DrawablePath.h b/src/gui/graphics/drawables/juce_DrawablePath.h
index 4e3262ad9e..9866684233 100644
--- a/src/gui/graphics/drawables/juce_DrawablePath.h
+++ b/src/gui/graphics/drawables/juce_DrawablePath.h
@@ -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 */
diff --git a/src/gui/graphics/drawables/juce_DrawableText.cpp b/src/gui/graphics/drawables/juce_DrawableText.cpp
index 25aeb0898a..a2ab91aab7 100644
--- a/src/gui/graphics/drawables/juce_DrawableText.cpp
+++ b/src/gui/graphics/drawables/juce_DrawableText.cpp
@@ -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);
diff --git a/src/gui/graphics/drawables/juce_DrawableText.h b/src/gui/graphics/drawables/juce_DrawableText.h
index 545e37c6fd..cb05dadf37 100644
--- a/src/gui/graphics/drawables/juce_DrawableText.h
+++ b/src/gui/graphics/drawables/juce_DrawableText.h
@@ -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 */