From 4c951ecce690b07b2ff9458b3dc4578645a2cbb0 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Fri, 27 Jul 2012 22:00:59 +0100
Subject: [PATCH] TextPropertyComponent colour fix.

---
 modules/juce_graphics/fonts/juce_Typeface.cpp               | 6 +++---
 .../properties/juce_TextPropertyComponent.cpp               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/juce_graphics/fonts/juce_Typeface.cpp b/modules/juce_graphics/fonts/juce_Typeface.cpp
index 9266c23800..c845384ae0 100644
--- a/modules/juce_graphics/fonts/juce_Typeface.cpp
+++ b/modules/juce_graphics/fonts/juce_Typeface.cpp
@@ -28,9 +28,9 @@ struct FontStyleHelpers
     static const char* getStyleName (const bool bold,
                                      const bool italic) noexcept
     {
-        if (bold && ! italic)   return "Bold";
-        if (italic && ! bold)   return "Italic";
-        if (bold && italic)     return "Bold Italic";
+        if (bold && italic) return "Bold Italic";
+        if (bold)           return "Bold";
+        if (italic)         return "Italic";
         return "Regular";
     }
 
diff --git a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
index ba1babd117..4a8d4d10fe 100644
--- a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
+++ b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.cpp
@@ -35,8 +35,8 @@ public:
     {
         setEditable (true, true, false);
 
-        setColour (backgroundColourId, findColour (ComboBox::backgroundColourId));
-        setColour (outlineColourId, findColour (ComboBox::outlineColourId));
+        setColour (backgroundColourId, findColour (Label::backgroundColourId));
+        setColour (outlineColourId, findColour (Label::outlineColourId));
     }
 
     TextEditor* createEditorComponent()