From 46700d820d6ff4fb72105f653754c0385797e25f Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 10 Dec 2020 12:28:11 +0000 Subject: [PATCH] Fixed a compile error in the push notifications demo --- examples/Utilities/PushNotificationsDemo.h | 38 +++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/examples/Utilities/PushNotificationsDemo.h b/examples/Utilities/PushNotificationsDemo.h index 8d3445dc87..e5a51e85ed 100644 --- a/examples/Utilities/PushNotificationsDemo.h +++ b/examples/Utilities/PushNotificationsDemo.h @@ -503,28 +503,34 @@ private: void setupAccentColour() { - paramControls.accentColourSelector = new ColourSelector(); - paramControls.accentColourSelector->setName ("accent colour"); - paramControls.accentColourSelector->setCurrentColour (paramControls.accentColourButton.findColour (TextButton::buttonColourId)); - paramControls.accentColourSelector->setColour (ColourSelector::backgroundColourId, Colours::transparentBlack); - paramControls.accentColourSelector->setSize (200, 200); - paramControls.accentColourSelector->addComponentListener (this); - paramControls.accentColourSelector->addChangeListener (this); + auto accentColourSelector = std::make_unique(); - CallOutBox::launchAsynchronously (paramControls.accentColourSelector, paramControls.accentColourButton.getScreenBounds(), nullptr); + accentColourSelector->setName ("accent colour"); + accentColourSelector->setCurrentColour (paramControls.accentColourButton.findColour (TextButton::buttonColourId)); + accentColourSelector->setColour (ColourSelector::backgroundColourId, Colours::transparentBlack); + accentColourSelector->setSize (200, 200); + accentColourSelector->addComponentListener (this); + accentColourSelector->addChangeListener (this); + + paramControls.accentColourSelector = accentColourSelector.get(); + + CallOutBox::launchAsynchronously (std::move (accentColourSelector), paramControls.accentColourButton.getScreenBounds(), nullptr); } void setupLedColour() { - paramControls.ledColourSelector = new ColourSelector(); - paramControls.ledColourSelector->setName ("led colour"); - paramControls.ledColourSelector->setCurrentColour (paramControls.ledColourButton.findColour (TextButton::buttonColourId)); - paramControls.ledColourSelector->setColour (ColourSelector::backgroundColourId, Colours::transparentBlack); - paramControls.ledColourSelector->setSize (200, 200); - paramControls.ledColourSelector->addComponentListener (this); - paramControls.ledColourSelector->addChangeListener (this); + auto ledColourSelector = std::make_unique(); - CallOutBox::launchAsynchronously (paramControls.ledColourSelector, paramControls.accentColourButton.getScreenBounds(), nullptr); + ledColourSelector->setName ("led colour"); + ledColourSelector->setCurrentColour (paramControls.ledColourButton.findColour (TextButton::buttonColourId)); + ledColourSelector->setColour (ColourSelector::backgroundColourId, Colours::transparentBlack); + ledColourSelector->setSize (200, 200); + ledColourSelector->addComponentListener (this); + ledColourSelector->addChangeListener (this); + + paramControls.ledColourSelector = ledColourSelector.get(); + + CallOutBox::launchAsynchronously (std::move (ledColourSelector), paramControls.accentColourButton.getScreenBounds(), nullptr); } void changeListenerCallback (ChangeBroadcaster* source) override