From e71084a7e9485e641d41c649ac2b9e5f596f13b4 Mon Sep 17 00:00:00 2001 From: hogliux Date: Tue, 26 Jun 2018 18:13:46 +0100 Subject: [PATCH] Fixed a windows warning in the previous commit --- modules/juce_gui_basics/widgets/juce_ComboBox.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp index c4f4960c8f..bfc6f165c1 100644 --- a/modules/juce_gui_basics/widgets/juce_ComboBox.cpp +++ b/modules/juce_gui_basics/widgets/juce_ComboBox.cpp @@ -545,10 +545,10 @@ void ComboBox::showPopup() menu.addItem (1, noChoicesMessage, false, false); } - auto& lookAndFeel = getLookAndFeel(); + auto& lf = getLookAndFeel(); - menu.setLookAndFeel (&lookAndFeel); - menu.showMenuAsync (lookAndFeel.getOptionsForComboBoxPopupMenu (*this, *label), + menu.setLookAndFeel (&lf); + menu.showMenuAsync (lf.getOptionsForComboBoxPopupMenu (*this, *label), ModalCallbackFunction::forComponent (comboBoxPopupMenuFinishedCallback, this)); }