From fb3a3a0fb4bb032b596c136eb2e13eda587bf1eb Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 7 May 2014 10:01:24 +0100
Subject: [PATCH] Made ComboBox update its L+F when reparented.

---
 .../juce_gui_basics/widgets/juce_ComboBox.cpp  | 18 +++++++++++-------
 .../juce_gui_basics/widgets/juce_ComboBox.h    |  2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp
index 0163a16f05..e434fab82e 100644
--- a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp
+++ b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp
@@ -49,7 +49,6 @@ ComboBox::ComboBox (const String& name)
       noChoicesMessage (TRANS("(no choices)"))
 {
     setRepaintsOnMouseActivity (true);
-    ComboBox::lookAndFeelChanged();
     currentId.addListener (this);
 }
 
@@ -410,12 +409,22 @@ void ComboBox::enablementChanged()
     repaint();
 }
 
+void ComboBox::colourChanged()
+{
+    lookAndFeelChanged();
+}
+
+void ComboBox::parentHierarchyChanged()
+{
+    lookAndFeelChanged();
+}
+
 void ComboBox::lookAndFeelChanged()
 {
     repaint();
 
     {
-        ScopedPointer <Label> newLabel (getLookAndFeel().createComboBoxTextBox (*this));
+        ScopedPointer<Label> newLabel (getLookAndFeel().createComboBoxTextBox (*this));
         jassert (newLabel != nullptr);
 
         if (label != nullptr)
@@ -446,11 +455,6 @@ void ComboBox::lookAndFeelChanged()
     resized();
 }
 
-void ComboBox::colourChanged()
-{
-    lookAndFeelChanged();
-}
-
 //==============================================================================
 bool ComboBox::keyPressed (const KeyPress& key)
 {
diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.h b/modules/juce_gui_basics/widgets/juce_ComboBox.h
index 380237add6..20e2e09e2d 100644
--- a/modules/juce_gui_basics/widgets/juce_ComboBox.h
+++ b/modules/juce_gui_basics/widgets/juce_ComboBox.h
@@ -393,6 +393,8 @@ public:
     bool keyPressed (const KeyPress&) override;
     /** @internal */
     void valueChanged (Value&) override;
+    /** @internal */
+    void parentHierarchyChanged() override;
 
     // These methods' bool parameters have changed: see their new method signatures.
     JUCE_DEPRECATED (void clear (bool));