mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
Tidied up a few compiler warnings in the demo code.
This commit is contained in:
parent
eb652751c2
commit
f26152fa72
7 changed files with 24 additions and 17 deletions
|
|
@ -46,7 +46,7 @@ public:
|
|||
draggers.getUnchecked(2)->relativePos = Point<float> (0.05f, 0.85f);
|
||||
}
|
||||
|
||||
void paint (Graphics& g)
|
||||
void paint (Graphics& g) override
|
||||
{
|
||||
fillTiledBackground (g);
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ private:
|
|||
setRepaintsOnMouseActivity (true);
|
||||
}
|
||||
|
||||
void paint (Graphics& g)
|
||||
void paint (Graphics& g) override
|
||||
{
|
||||
g.setColour (Colours::white.withAlpha (isMouseOverOrDragging() ? 0.9f : 0.5f));
|
||||
g.fillEllipse (getLocalBounds().reduced (3).toFloat());
|
||||
|
|
|
|||
|
|
@ -109,12 +109,12 @@ public:
|
|||
}
|
||||
|
||||
//==============================================================================
|
||||
void paint (Graphics& g)
|
||||
void paint (Graphics& g) override
|
||||
{
|
||||
fillTiledBackground (g);
|
||||
}
|
||||
|
||||
void resized()
|
||||
void resized() override
|
||||
{
|
||||
Rectangle<int> r (getLocalBounds().reduced (5));
|
||||
|
||||
|
|
@ -149,27 +149,27 @@ public:
|
|||
demoTextBox.setBounds (r);
|
||||
}
|
||||
|
||||
void sliderValueChanged (Slider* sliderThatWasMoved)
|
||||
void sliderValueChanged (Slider* sliderThatWasMoved) override
|
||||
{
|
||||
if (sliderThatWasMoved == &heightSlider) refreshPreviewBoxFont();
|
||||
else if (sliderThatWasMoved == &kerningSlider) refreshPreviewBoxFont();
|
||||
else if (sliderThatWasMoved == &scaleSlider) refreshPreviewBoxFont();
|
||||
}
|
||||
|
||||
void buttonClicked (Button* buttonThatWasClicked)
|
||||
void buttonClicked (Button* buttonThatWasClicked) override
|
||||
{
|
||||
if (buttonThatWasClicked == &boldToggle) refreshPreviewBoxFont();
|
||||
else if (buttonThatWasClicked == &italicToggle) refreshPreviewBoxFont();
|
||||
}
|
||||
|
||||
// The following methods implement the ListBoxModel virtual methods:
|
||||
int getNumRows()
|
||||
int getNumRows() override
|
||||
{
|
||||
return fonts.size();
|
||||
}
|
||||
|
||||
void paintListBoxItem (int rowNumber, Graphics& g,
|
||||
int width, int height, bool rowIsSelected)
|
||||
int width, int height, bool rowIsSelected) override
|
||||
{
|
||||
if (rowIsSelected)
|
||||
g.fillAll (Colours::lightblue);
|
||||
|
|
@ -185,7 +185,7 @@ public:
|
|||
s.draw (g, Rectangle<int> (width, height).expanded (-4, 50).toFloat());
|
||||
}
|
||||
|
||||
void selectedRowsChanged (int /*lastRowselected*/)
|
||||
void selectedRowsChanged (int /*lastRowselected*/) override
|
||||
{
|
||||
refreshPreviewBoxFont();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public:
|
|||
initialiseToggle (quality, "Higher quality image interpolation", false);
|
||||
}
|
||||
|
||||
void paint (Graphics& g)
|
||||
void paint (Graphics& g) override
|
||||
{
|
||||
fillTiledBackground (g);
|
||||
}
|
||||
|
|
@ -686,7 +686,7 @@ public:
|
|||
addAndMakeVisible (testList);
|
||||
}
|
||||
|
||||
void paint (Graphics& g)
|
||||
void paint (Graphics& g) override
|
||||
{
|
||||
g.fillAll (Colours::grey);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ public:
|
|||
};
|
||||
|
||||
|
||||
void paint (Graphics& g)
|
||||
void paint (Graphics& g) override
|
||||
{
|
||||
fillTiledBackground (g);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ public:
|
|||
// not interested in this for now
|
||||
}
|
||||
|
||||
File getSuggestedSaveAsFile (const File&)
|
||||
File getSuggestedSaveAsFile (const File&) override
|
||||
{
|
||||
return File::getSpecialLocation (File::userDesktopDirectory).getChildFile (getName()).withFileExtension ("jnote");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ public:
|
|||
shader = nullptr;
|
||||
}
|
||||
|
||||
void paint (Graphics& g)
|
||||
void paint (Graphics& g) override
|
||||
{
|
||||
g.fillCheckerBoard (getLocalBounds(), 48, 48, Colours::lightgrey, Colours::white);
|
||||
|
||||
|
|
|
|||
|
|
@ -368,19 +368,19 @@ private:
|
|||
case MainAppWindow::useLookAndFeelV1:
|
||||
result.setInfo ("Use LookAndFeel_V1", String::empty, generalCategory, 0);
|
||||
result.addDefaultKeypress ('i', ModifierKeys::commandModifier);
|
||||
result.setTicked (typeid (LookAndFeel_V1) == typeid (getLookAndFeel()));
|
||||
result.setTicked (isLookAndFeelSelected<LookAndFeel_V1>());
|
||||
break;
|
||||
|
||||
case MainAppWindow::useLookAndFeelV2:
|
||||
result.setInfo ("Use LookAndFeel_V2", String::empty, generalCategory, 0);
|
||||
result.addDefaultKeypress ('o', ModifierKeys::commandModifier);
|
||||
result.setTicked (typeid (LookAndFeel_V2) == typeid (getLookAndFeel()));
|
||||
result.setTicked (isLookAndFeelSelected<LookAndFeel_V2>());
|
||||
break;
|
||||
|
||||
case MainAppWindow::useLookAndFeelV3:
|
||||
result.setInfo ("Use LookAndFeel_V3", String::empty, generalCategory, 0);
|
||||
result.addDefaultKeypress ('p', ModifierKeys::commandModifier);
|
||||
result.setTicked (typeid (LookAndFeel_V3) == typeid (getLookAndFeel()));
|
||||
result.setTicked (isLookAndFeelSelected<LookAndFeel_V3>());
|
||||
break;
|
||||
|
||||
case MainAppWindow::toggleRepaintDebugging:
|
||||
|
|
@ -478,6 +478,13 @@ private:
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
template <typename LookAndFeelType>
|
||||
bool isLookAndFeelSelected()
|
||||
{
|
||||
LookAndFeel& lf = getLookAndFeel();
|
||||
return typeid (LookAndFeelType) == typeid (lf);
|
||||
}
|
||||
};
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue