Browse Source

Added some 'override' modifiers to overridden methods.

tags/2021-05-28
jules 12 years ago
parent
commit
c75a7300f5
100 changed files with 369 additions and 371 deletions
  1. +1
    -1
      extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp
  2. +1
    -1
      extras/Introjucer/Source/Application/jucer_Application.h
  3. +3
    -3
      extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp
  4. +1
    -1
      extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.h
  5. +1
    -1
      extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h
  6. +1
    -1
      extras/Introjucer/Source/Project/jucer_ModulesPanel.h
  7. +1
    -1
      extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
  8. +2
    -2
      extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
  9. +1
    -1
      extras/JuceDemo/Source/demos/ThreadingDemo.cpp
  10. +1
    -1
      extras/JuceDemo/Source/demos/WidgetsDemo.cpp
  11. +1
    -1
      modules/juce_audio_devices/midi_io/juce_MidiOutput.h
  12. +1
    -1
      modules/juce_audio_devices/native/juce_android_Audio.cpp
  13. +1
    -1
      modules/juce_audio_devices/native/juce_android_OpenSL.cpp
  14. +1
    -1
      modules/juce_audio_devices/native/juce_linux_ALSA.cpp
  15. +1
    -1
      modules/juce_audio_devices/native/juce_linux_Midi.cpp
  16. +1
    -1
      modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm
  17. +1
    -1
      modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
  18. +1
    -1
      modules/juce_audio_devices/native/juce_win32_ASIO.cpp
  19. +1
    -1
      modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp
  20. +1
    -1
      modules/juce_audio_devices/native/juce_win32_DirectSound.cpp
  21. +2
    -2
      modules/juce_audio_devices/native/juce_win32_WASAPI.cpp
  22. +2
    -2
      modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
  23. +2
    -2
      modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
  24. +10
    -10
      modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  25. +1
    -1
      modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h
  26. +8
    -8
      modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
  27. +5
    -5
      modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  28. +1
    -1
      modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
  29. +1
    -1
      modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp
  30. +2
    -2
      modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h
  31. +1
    -1
      modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
  32. +4
    -4
      modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp
  33. +10
    -10
      modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
  34. +15
    -15
      modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
  35. +2
    -2
      modules/juce_browser_plugin/wrapper/juce_ActiveX_GlueCode.cpp
  36. +2
    -2
      modules/juce_browser_plugin/wrapper/juce_NPAPI_GlueCode.cpp
  37. +1
    -1
      modules/juce_core/native/juce_mac_Network.mm
  38. +1
    -1
      modules/juce_core/threads/juce_ThreadPool.cpp
  39. +1
    -1
      modules/juce_core/threads/juce_TimeSliceThread.h
  40. +1
    -1
      modules/juce_data_structures/app_properties/juce_PropertiesFile.h
  41. +1
    -1
      modules/juce_data_structures/values/juce_Value.cpp
  42. +1
    -1
      modules/juce_events/broadcasters/juce_ChangeBroadcaster.h
  43. +1
    -1
      modules/juce_events/interprocess/juce_InterprocessConnection.h
  44. +1
    -1
      modules/juce_events/interprocess/juce_InterprocessConnectionServer.h
  45. +1
    -1
      modules/juce_events/native/juce_win32_HiddenMessageWindow.h
  46. +1
    -1
      modules/juce_events/timers/juce_MultiTimer.cpp
  47. +3
    -3
      modules/juce_events/timers/juce_Timer.cpp
  48. +1
    -1
      modules/juce_graphics/images/juce_ImageCache.cpp
  49. +18
    -18
      modules/juce_gui_basics/buttons/juce_Button.h
  50. +5
    -5
      modules/juce_gui_basics/buttons/juce_DrawableButton.h
  51. +2
    -2
      modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h
  52. +1
    -1
      modules/juce_gui_basics/components/juce_Component.cpp
  53. +8
    -8
      modules/juce_gui_basics/components/juce_Component.h
  54. +1
    -1
      modules/juce_gui_basics/components/juce_Desktop.cpp
  55. +2
    -2
      modules/juce_gui_basics/components/juce_Desktop.h
  56. +1
    -1
      modules/juce_gui_basics/components/juce_ModalComponentManager.h
  57. +5
    -5
      modules/juce_gui_basics/drawables/juce_DrawableImage.h
  58. +3
    -3
      modules/juce_gui_basics/drawables/juce_DrawableShape.h
  59. +4
    -4
      modules/juce_gui_basics/drawables/juce_DrawableText.h
  60. +14
    -14
      modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h
  61. +2
    -2
      modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp
  62. +5
    -5
      modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp
  63. +11
    -12
      modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h
  64. +12
    -12
      modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp
  65. +10
    -10
      modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h
  66. +3
    -3
      modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h
  67. +2
    -2
      modules/juce_gui_basics/keyboard/juce_CaretComponent.h
  68. +1
    -1
      modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp
  69. +5
    -5
      modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp
  70. +1
    -1
      modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
  71. +3
    -3
      modules/juce_gui_basics/layout/juce_GroupComponent.h
  72. +3
    -3
      modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h
  73. +7
    -7
      modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
  74. +5
    -5
      modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h
  75. +4
    -4
      modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h
  76. +10
    -10
      modules/juce_gui_basics/layout/juce_ScrollBar.h
  77. +3
    -3
      modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h
  78. +3
    -3
      modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp
  79. +3
    -3
      modules/juce_gui_basics/layout/juce_TabbedComponent.h
  80. +13
    -14
      modules/juce_gui_basics/menus/juce_MenuBarComponent.h
  81. +3
    -3
      modules/juce_gui_basics/menus/juce_MenuBarModel.h
  82. +14
    -14
      modules/juce_gui_basics/menus/juce_PopupMenu.cpp
  83. +1
    -1
      modules/juce_gui_basics/misc/juce_BubbleComponent.h
  84. +2
    -2
      modules/juce_gui_basics/misc/juce_DropShadower.cpp
  85. +4
    -4
      modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp
  86. +2
    -2
      modules/juce_gui_basics/mouse/juce_LassoComponent.h
  87. +1
    -1
      modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp
  88. +1
    -1
      modules/juce_gui_basics/native/juce_linux_Windowing.cpp
  89. +3
    -3
      modules/juce_gui_basics/native/juce_mac_Windowing.mm
  90. +2
    -2
      modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
  91. +3
    -3
      modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  92. +3
    -3
      modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h
  93. +3
    -3
      modules/juce_gui_basics/properties/juce_PropertyComponent.h
  94. +5
    -5
      modules/juce_gui_basics/properties/juce_PropertyPanel.cpp
  95. +2
    -2
      modules/juce_gui_basics/properties/juce_PropertyPanel.h
  96. +16
    -16
      modules/juce_gui_basics/widgets/juce_ComboBox.h
  97. +1
    -1
      modules/juce_gui_basics/widgets/juce_ImageComponent.cpp
  98. +2
    -2
      modules/juce_gui_basics/widgets/juce_ImageComponent.h
  99. +17
    -17
      modules/juce_gui_basics/widgets/juce_Label.h
  100. +9
    -9
      modules/juce_gui_basics/widgets/juce_ListBox.h

+ 1
- 1
extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp View File

@@ -307,7 +307,7 @@ struct AppearanceEditor
getLookAndFeel().drawSpinningWaitAnimation (g, Colours::white, (getWidth() - size) / 2, getHeight() / 2 - 50, size, size); getLookAndFeel().drawSpinningWaitAnimation (g, Colours::white, (getWidth() - size) / 2, getHeight() / 2 - 50, size, size);
} }
void timerCallback()
void timerCallback() override
{ {
repaint(); repaint();


+ 1
- 1
extras/Introjucer/Source/Application/jucer_Application.h View File

@@ -595,7 +595,7 @@ private:
public: public:
AsyncQuitRetrier() { startTimer (500); } AsyncQuitRetrier() { startTimer (500); }
void timerCallback()
void timerCallback() override
{ {
stopTimer(); stopTimer();
delete this; delete this;


+ 3
- 3
extras/Introjucer/Source/Application/jucer_JuceUpdater.cpp View File

@@ -146,7 +146,7 @@ public:
stopThread (10000); stopThread (10000);
} }
void run()
void run() override
{ {
if (downloaded.loadFromWebsite()) if (downloaded.loadFromWebsite())
triggerAsyncUpdate(); triggerAsyncUpdate();
@@ -156,7 +156,7 @@ public:
"Couldn't connect to the JUCE webserver!"); "Couldn't connect to the JUCE webserver!");
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
owner.backgroundUpdateComplete (downloaded); owner.backgroundUpdateComplete (downloaded);
} }
@@ -346,7 +346,7 @@ public:
{ {
} }
void run()
void run() override
{ {
for (int i = 0; i < itemsToInstall.size(); ++i) for (int i = 0; i < itemsToInstall.size(); ++i)
{ {


+ 1
- 1
extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.h View File

@@ -163,7 +163,7 @@ private:
ScopedPointer<XmlElement> currentXML; ScopedPointer<XmlElement> currentXML;
ScopedPointer<Timer> userDocChangeTimer; ScopedPointer<Timer> userDocChangeTimer;
void timerCallback();
void timerCallback() override;
void codeDocumentTextInserted (const String& newText, int insertIndex); void codeDocumentTextInserted (const String& newText, int insertIndex);
void codeDocumentTextDeleted (int startIndex, int endIndex); void codeDocumentTextDeleted (int startIndex, int endIndex);
void userEditedCpp(); void userEditedCpp();


+ 1
- 1
extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h View File

@@ -54,7 +54,7 @@ public:
saver (ps), result (Result::ok()) saver (ps), result (Result::ok())
{} {}
void run()
void run() override
{ {
setProgress (-1); setProgress (-1);
result = saver.save (false); result = saver.save (false);


+ 1
- 1
extras/Introjucer/Source/Project/jucer_ModulesPanel.h View File

@@ -490,7 +490,7 @@ public:
refresh(); refresh();
} }
void timerCallback()
void timerCallback() override
{ {
refresh(); refresh();
} }


+ 1
- 1
extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp View File

@@ -400,7 +400,7 @@ public:
startTimer (500); startTimer (500);
} }
void timerCallback()
void timerCallback() override
{ {
stopTimer(); stopTimer();
commandManager->invoke (info, true); commandManager->invoke (info, true);


+ 2
- 2
extras/Introjucer/Source/Utility/jucer_MiscUtilities.h View File

@@ -96,8 +96,8 @@ class RolloverHelpComp : public Component,
public: public:
RolloverHelpComp(); RolloverHelpComp();
void paint (Graphics& g);
void timerCallback();
void paint (Graphics&) override;
void timerCallback() override;
private: private:
Component* lastComp; Component* lastComp;


+ 1
- 1
extras/JuceDemo/Source/demos/ThreadingDemo.cpp View File

@@ -135,7 +135,7 @@ public:
stopThread (2000); stopThread (2000);
} }
void run()
void run() override
{ {
// this is the code that runs this thread - we'll loop continuously, // this is the code that runs this thread - we'll loop continuously,
// updating the co-ordinates of our blob. // updating the co-ordinates of our blob.


+ 1
- 1
extras/JuceDemo/Source/demos/WidgetsDemo.cpp View File

@@ -963,7 +963,7 @@ public:
setStatusMessage ("Getting ready..."); setStatusMessage ("Getting ready...");
} }
void run()
void run() override
{ {
setProgress (-1.0); // setting a value beyond the range 0 -> 1 will show a spinning bar.. setProgress (-1.0); // setting a value beyond the range 0 -> 1 will show a spinning bar..
setStatusMessage ("Preparing to do some stuff..."); setStatusMessage ("Preparing to do some stuff...");


+ 1
- 1
modules/juce_audio_devices/midi_io/juce_MidiOutput.h View File

@@ -137,7 +137,7 @@ protected:
PendingMessage* firstMessage; PendingMessage* firstMessage;
MidiOutput(); MidiOutput();
void run();
void run() override;
private: private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MidiOutput) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MidiOutput)


+ 1
- 1
modules/juce_audio_devices/native/juce_android_Audio.cpp View File

@@ -277,7 +277,7 @@ public:
} }
} }
void run()
void run() override
{ {
JNIEnv* env = getEnv(); JNIEnv* env = getEnv();
jshortArray audioBuffer = env->NewShortArray (actualBufferSize * jmax (numDeviceOutputChannels, numDeviceInputChannels)); jshortArray audioBuffer = env->NewShortArray (actualBufferSize * jmax (numDeviceOutputChannels, numDeviceInputChannels));


+ 1
- 1
modules/juce_audio_devices/native/juce_android_OpenSL.cpp View File

@@ -172,7 +172,7 @@ public:
oldCallback->audioDeviceStopped(); oldCallback->audioDeviceStopped();
} }
void run()
void run() override
{ {
if (recorder != nullptr) recorder->start(); if (recorder != nullptr) recorder->start();
if (player != nullptr) player->start(); if (player != nullptr) player->start();


+ 1
- 1
modules/juce_audio_devices/native/juce_linux_ALSA.cpp View File

@@ -628,7 +628,7 @@ public:
callback = newCallback; callback = newCallback;
} }
void run()
void run() override
{ {
while (! threadShouldExit()) while (! threadShouldExit())
{ {


+ 1
- 1
modules/juce_audio_devices/native/juce_linux_Midi.cpp View File

@@ -124,7 +124,7 @@ private:
jassert (client.input && client.get() != nullptr); jassert (client.input && client.get() != nullptr);
} }
void run()
void run() override
{ {
const int maxEventSize = 16 * 1024; const int maxEventSize = 16 * 1024;
snd_midi_event_t* midiParser; snd_midi_event_t* midiParser;


+ 1
- 1
modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm View File

@@ -291,7 +291,7 @@ public:
stopTimer(); stopTimer();
} }
void timerCallback()
void timerCallback() override
{ {
const DiskState state = getDiskState(); const DiskState state = getDiskState();


+ 1
- 1
modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp View File

@@ -759,7 +759,7 @@ public:
startTimer (100); startTimer (100);
} }
void timerCallback()
void timerCallback() override
{ {
stopTimer(); stopTimer();
JUCE_COREAUDIOLOG ("CoreAudio device changed callback"); JUCE_COREAUDIOLOG ("CoreAudio device changed callback");


+ 1
- 1
modules/juce_audio_devices/native/juce_win32_ASIO.cpp View File

@@ -821,7 +821,7 @@ public:
startTimer (500); startTimer (500);
} }
void timerCallback()
void timerCallback() override
{ {
if (! insideControlPanelModalLoop) if (! insideControlPanelModalLoop)
{ {


+ 1
- 1
modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp View File

@@ -203,7 +203,7 @@ public:
&& SUCCEEDED (discRecorder->SetRecorderProperties (prop)); && SUCCEEDED (discRecorder->SetRecorderProperties (prop));
} }
void timerCallback()
void timerCallback() override
{ {
const DiskState state = getDiskState(); const DiskState state = getDiskState();


+ 1
- 1
modules/juce_audio_devices/native/juce_win32_DirectSound.cpp View File

@@ -910,7 +910,7 @@ private:
} }
public: public:
void run()
void run() override
{ {
while (! threadShouldExit()) while (! threadShouldExit())
{ {


+ 2
- 2
modules/juce_audio_devices/native/juce_win32_WASAPI.cpp View File

@@ -1054,7 +1054,7 @@ public:
} }
} }
void run()
void run() override
{ {
setMMThreadPriority(); setMMThreadPriority();
@@ -1178,7 +1178,7 @@ private:
} }
//============================================================================== //==============================================================================
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
stop(); stop();


+ 2
- 2
modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp View File

@@ -324,12 +324,12 @@ struct AAXClasses
} }
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
g.fillAll (Colours::black); g.fillAll (Colours::black);
} }
void childBoundsChanged (Component*)
void childBoundsChanged (Component*) override
{ {
if (pluginEditor != nullptr) if (pluginEditor != nullptr)
{ {


+ 2
- 2
modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp View File

@@ -235,7 +235,7 @@ public:
} }
} }
void timerCallback()
void timerCallback() override
{ {
if (! juce::Component::isMouseButtonDownAnywhere()) if (! juce::Component::isMouseButtonDownAnywhere())
{ {
@@ -499,7 +499,7 @@ protected:
midiEvents.ensureSize (2048); midiEvents.ensureSize (2048);
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
if (! prepared) if (! prepared)
{ {


+ 10
- 10
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp View File

@@ -280,7 +280,7 @@ public:
clearSingletonInstance(); clearSingletonInstance();
} }
void run()
void run() override
{ {
initialiseJuce_GUI(); initialiseJuce_GUI();
initialised = true; initialised = true;
@@ -1038,7 +1038,7 @@ public:
return 0; return 0;
} }
void timerCallback()
void timerCallback() override
{ {
if (shouldDeleteEditor) if (shouldDeleteEditor)
{ {
@@ -1353,9 +1353,9 @@ public:
// have been transferred to another parent which takes over ownership. // have been transferred to another parent which takes over ownership.
} }
void paint (Graphics&) {}
void paint (Graphics&) override {}
void paintOverChildren (Graphics&)
void paintOverChildren (Graphics&) override
{ {
// this causes an async call to masterIdle() to help // this causes an async call to masterIdle() to help
// creaky old DAWs like Nuendo repaint themselves while we're // creaky old DAWs like Nuendo repaint themselves while we're
@@ -1365,7 +1365,7 @@ public:
} }
#if JUCE_MAC #if JUCE_MAC
bool keyPressed (const KeyPress&)
bool keyPressed (const KeyPress&) override
{ {
// If we have an unused keypress, move the key-focus to a host window // If we have an unused keypress, move the key-focus to a host window
// and re-inject the event.. // and re-inject the event..
@@ -1378,13 +1378,13 @@ public:
return dynamic_cast <AudioProcessorEditor*> (getChildComponent (0)); return dynamic_cast <AudioProcessorEditor*> (getChildComponent (0));
} }
void resized()
void resized() override
{ {
if (Component* const editor = getChildComponent(0)) if (Component* const editor = getChildComponent(0))
editor->setBounds (getLocalBounds()); editor->setBounds (getLocalBounds());
} }
void childBoundsChanged (Component* child)
void childBoundsChanged (Component* child) override
{ {
child->setTopLeftPosition (0, 0); child->setTopLeftPosition (0, 0);
@@ -1408,18 +1408,18 @@ public:
#endif #endif
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
wrapper.tryMasterIdle(); wrapper.tryMasterIdle();
} }
#if JUCE_WINDOWS #if JUCE_WINDOWS
void mouseDown (const MouseEvent&)
void mouseDown (const MouseEvent&) override
{ {
broughtToFront(); broughtToFront();
} }
void broughtToFront()
void broughtToFront() override
{ {
// for hosts like nuendo, need to also pop the MDI container to the // for hosts like nuendo, need to also pop the MDI container to the
// front when our comp is clicked on. // front when our comp is clicked on.


+ 1
- 1
modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h View File

@@ -37,7 +37,7 @@ public:
startTimer (1000 / 30); startTimer (1000 / 30);
} }
void timerCallback()
void timerCallback() override
{ {
// workaround for carbon windows not getting mouse-moves.. // workaround for carbon windows not getting mouse-moves..
const Point<int> screenPos (Desktop::getInstance().getMainMouseSource().getScreenPosition()); const Point<int> screenPos (Desktop::getInstance().getMainMouseSource().getScreenPosition());


+ 8
- 8
modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm View File

@@ -1286,23 +1286,23 @@ public:
bool isValid() const { return wrapper.getView() != nil; } bool isValid() const { return wrapper.getView() != nil; }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
g.fillAll (Colours::white); g.fillAll (Colours::white);
} }
void resized()
void resized() override
{ {
wrapper.setSize (getWidth(), getHeight()); wrapper.setSize (getWidth(), getHeight());
} }
void timerCallback()
void timerCallback() override
{ {
wrapper.resizeToFitView(); wrapper.resizeToFitView();
startTimer (jmin (713, getTimerInterval() + 51)); startTimer (jmin (713, getTimerInterval() + 51));
} }
void childBoundsChanged (Component* child)
void childBoundsChanged (Component* child) override
{ {
setSize (wrapper.getWidth(), wrapper.getHeight()); setSize (wrapper.getWidth(), wrapper.getHeight());
startTimer (70); startTimer (70);
@@ -1424,20 +1424,20 @@ public:
bool isValid() const noexcept { return audioComponent != nullptr; } bool isValid() const noexcept { return audioComponent != nullptr; }
//============================================================================== //==============================================================================
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
g.fillAll (Colours::black); g.fillAll (Colours::black);
} }
void resized()
void resized() override
{ {
if (innerWrapper != nullptr) if (innerWrapper != nullptr)
innerWrapper->setSize (getWidth(), getHeight()); innerWrapper->setSize (getWidth(), getHeight());
} }
//============================================================================== //==============================================================================
bool keyStateChanged (bool) { return false; }
bool keyPressed (const KeyPress&) { return false; }
bool keyStateChanged (bool) override { return false; }
bool keyPressed (const KeyPress&) override { return false; }
//============================================================================== //==============================================================================
AudioUnit getAudioUnit() const { return plugin.audioUnit; } AudioUnit getAudioUnit() const { return plugin.audioUnit; }


+ 5
- 5
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp View File

@@ -1232,13 +1232,13 @@ public:
void setCurrentProgramStateInformation (const void* data, int size) { loadFromFXBFile (data, size); } void setCurrentProgramStateInformation (const void* data, int size) { loadFromFXBFile (data, size); }
//============================================================================== //==============================================================================
void timerCallback()
void timerCallback() override
{ {
if (dispatch (effIdle, 0, 0, 0, 0) == 0) if (dispatch (effIdle, 0, 0, 0, 0) == 0)
stopTimer(); stopTimer();
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
// indicates that something about the plugin has changed.. // indicates that something about the plugin has changed..
updateHostDisplay(); updateHostDisplay();
@@ -2006,12 +2006,12 @@ public:
//============================================================================== //==============================================================================
#if JUCE_MAC #if JUCE_MAC
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
g.fillAll (Colours::black); g.fillAll (Colours::black);
} }
#else #else
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (isOpen) if (isOpen)
{ {
@@ -2046,7 +2046,7 @@ public:
#endif #endif
//============================================================================== //==============================================================================
void timerCallback()
void timerCallback() override
{ {
if (isShowing()) if (isShowing())
{ {


+ 1
- 1
modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h View File

@@ -405,7 +405,7 @@ private:
MidiBuffer* currentMidiInputBuffer; MidiBuffer* currentMidiInputBuffer;
MidiBuffer currentMidiOutputBuffer; MidiBuffer currentMidiOutputBuffer;
void handleAsyncUpdate();
void handleAsyncUpdate() override;
void clearRenderingSequence(); void clearRenderingSequence();
void buildRenderingSequence(); void buildRenderingSequence();
bool isAnInputTo (uint32 possibleInputId, uint32 possibleDestinationId, int recursionCheck) const; bool isAnInputTo (uint32 possibleInputId, uint32 possibleDestinationId, int recursionCheck) const;


+ 1
- 1
modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp View File

@@ -58,7 +58,7 @@ public:
paramHasChanged = true; paramHasChanged = true;
} }
void timerCallback()
void timerCallback() override
{ {
if (paramHasChanged) if (paramHasChanged)
{ {


+ 2
- 2
modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h View File

@@ -46,8 +46,8 @@ public:
~GenericAudioProcessorEditor(); ~GenericAudioProcessorEditor();
//============================================================================== //==============================================================================
void paint (Graphics& g);
void resized();
void paint (Graphics&) override;
void resized() override;
private: private:
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp View File

@@ -351,7 +351,7 @@ private:
: StringArray()); : StringArray());
} }
void timerCallback()
void timerCallback() override
{ {
if (pool == nullptr) if (pool == nullptr)
{ {


+ 4
- 4
modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp View File

@@ -39,7 +39,7 @@ public:
manager->enableInputLevelMeasurement (false); manager->enableInputLevelMeasurement (false);
} }
void timerCallback()
void timerCallback() override
{ {
const float newLevel = (float) manager->getCurrentInputLevel(); const float newLevel = (float) manager->getCurrentInputLevel();
@@ -50,7 +50,7 @@ public:
} }
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
getLookAndFeel().drawLevelMeter (g, getWidth(), getHeight(), getLookAndFeel().drawLevelMeter (g, getWidth(), getHeight(),
(float) exp (log (level) / 3.0)); // (add a bit of a skew to make the level more obvious) (float) exp (log (level) / 3.0)); // (add a bit of a skew to make the level more obvious)
@@ -134,7 +134,7 @@ public:
flipEnablement (row); flipEnablement (row);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
ListBox::paint (g); ListBox::paint (g);
@@ -778,7 +778,7 @@ public:
flipEnablement (row); flipEnablement (row);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
ListBox::paint (g); ListBox::paint (g);


+ 10
- 10
modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h View File

@@ -60,14 +60,14 @@ public:
are shown, with an "advanced" button that shows the rest of them are shown, with an "advanced" button that shows the rest of them
*/ */
AudioDeviceSelectorComponent (AudioDeviceManager& deviceManager, AudioDeviceSelectorComponent (AudioDeviceManager& deviceManager,
const int minAudioInputChannels,
const int maxAudioInputChannels,
const int minAudioOutputChannels,
const int maxAudioOutputChannels,
const bool showMidiInputOptions,
const bool showMidiOutputSelector,
const bool showChannelsAsStereoPairs,
const bool hideAdvancedOptionsWithButton);
int minAudioInputChannels,
int maxAudioInputChannels,
int minAudioOutputChannels,
int maxAudioOutputChannels,
bool showMidiInputOptions,
bool showMidiOutputSelector,
bool showChannelsAsStereoPairs,
bool hideAdvancedOptionsWithButton);
/** Destructor */ /** Destructor */
~AudioDeviceSelectorComponent(); ~AudioDeviceSelectorComponent();
@@ -77,9 +77,9 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void childBoundsChanged (Component*);
void childBoundsChanged (Component*) override;
private: private:
//============================================================================== //==============================================================================


+ 15
- 15
modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h View File

@@ -264,35 +264,35 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void mouseMove (const MouseEvent&);
void mouseMove (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent&);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent&);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent&);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseEnter (const MouseEvent&);
void mouseEnter (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseExit (const MouseEvent&);
void mouseExit (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&);
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override;
/** @internal */ /** @internal */
void timerCallback();
void timerCallback() override;
/** @internal */ /** @internal */
bool keyStateChanged (bool isKeyDown);
bool keyStateChanged (bool isKeyDown) override;
/** @internal */ /** @internal */
void focusLost (FocusChangeType);
void focusLost (FocusChangeType) override;
/** @internal */ /** @internal */
void handleNoteOn (MidiKeyboardState*, int midiChannel, int midiNoteNumber, float velocity);
void handleNoteOn (MidiKeyboardState*, int midiChannel, int midiNoteNumber, float velocity) override;
/** @internal */ /** @internal */
void handleNoteOff (MidiKeyboardState*, int midiChannel, int midiNoteNumber);
void handleNoteOff (MidiKeyboardState*, int midiChannel, int midiNoteNumber) override;
/** @internal */ /** @internal */
void colourChanged();
void colourChanged() override;
protected: protected:
//============================================================================== //==============================================================================


+ 2
- 2
modules/juce_browser_plugin/wrapper/juce_ActiveX_GlueCode.cpp View File

@@ -447,13 +447,13 @@ public:
} }
//============================================================================== //==============================================================================
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (child == nullptr || ! child->isOpaque()) if (child == nullptr || ! child->isOpaque())
g.fillAll (Colours::white); g.fillAll (Colours::white);
} }
void resized()
void resized() override
{ {
if (child != nullptr) if (child != nullptr)
child->setBounds (getLocalBounds()); child->setBounds (getLocalBounds());


+ 2
- 2
modules/juce_browser_plugin/wrapper/juce_NPAPI_GlueCode.cpp View File

@@ -286,13 +286,13 @@ public:
} }
//============================================================================== //==============================================================================
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (child == nullptr || ! child->isOpaque()) if (child == nullptr || ! child->isOpaque())
g.fillAll (Colours::white); g.fillAll (Colours::white);
} }
void resized()
void resized() override
{ {
if (child != nullptr && ! isFirefox4) if (child != nullptr && ! isFirefox4)
child->setBounds (getLocalBounds()); child->setBounds (getLocalBounds());


+ 1
- 1
modules/juce_core/native/juce_mac_Network.mm View File

@@ -226,7 +226,7 @@ public:
signalThreadShouldExit(); signalThreadShouldExit();
} }
void run()
void run() override
{ {
connection = [[NSURLConnection alloc] initWithRequest: request connection = [[NSURLConnection alloc] initWithRequest: request
delegate: delegate]; delegate: delegate];


+ 1
- 1
modules/juce_core/threads/juce_ThreadPool.cpp View File

@@ -67,7 +67,7 @@ public:
{ {
} }
void run()
void run() override
{ {
while (! threadShouldExit()) while (! threadShouldExit())
{ {


+ 1
- 1
modules/juce_core/threads/juce_TimeSliceThread.h View File

@@ -134,7 +134,7 @@ public:
//============================================================================== //==============================================================================
#ifndef DOXYGEN #ifndef DOXYGEN
void run();
void run() override;
#endif #endif
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_data_structures/app_properties/juce_PropertiesFile.h View File

@@ -230,7 +230,7 @@ private:
typedef const ScopedPointer<InterProcessLock::ScopedLockType> ProcessScopedLock; typedef const ScopedPointer<InterProcessLock::ScopedLockType> ProcessScopedLock;
InterProcessLock::ScopedLockType* createProcessLock() const; InterProcessLock::ScopedLockType* createProcessLock() const;
void timerCallback();
void timerCallback() override;
bool saveAsXml(); bool saveAsXml();
bool saveAsBinary(); bool saveAsBinary();
bool loadAsXml(); bool loadAsXml();


+ 1
- 1
modules/juce_data_structures/values/juce_Value.cpp View File

@@ -52,7 +52,7 @@ private:
SourceSet sourcesNeedingAnUpdate; SourceSet sourcesNeedingAnUpdate;
SourceSet* sourcesBeingIterated; SourceSet* sourcesBeingIterated;
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
const ReferenceCountedObjectPtr<SharedValueSourceUpdater> localRef (this); const ReferenceCountedObjectPtr<SharedValueSourceUpdater> localRef (this);


+ 1
- 1
modules/juce_events/broadcasters/juce_ChangeBroadcaster.h View File

@@ -91,7 +91,7 @@ private:
{ {
public: public:
ChangeBroadcasterCallback(); ChangeBroadcasterCallback();
void handleAsyncUpdate();
void handleAsyncUpdate() override;
ChangeBroadcaster* owner; ChangeBroadcaster* owner;
}; };


+ 1
- 1
modules/juce_events/interprocess/juce_InterprocessConnection.h View File

@@ -194,7 +194,7 @@ private:
void connectionLostInt(); void connectionLostInt();
void deliverDataInt (const MemoryBlock&); void deliverDataInt (const MemoryBlock&);
bool readNextMessageInt(); bool readNextMessageInt();
void run();
void run() override;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InterprocessConnection) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InterprocessConnection)
}; };


+ 1
- 1
modules/juce_events/interprocess/juce_InterprocessConnectionServer.h View File

@@ -86,7 +86,7 @@ private:
//============================================================================== //==============================================================================
ScopedPointer <StreamingSocket> socket; ScopedPointer <StreamingSocket> socket;
void run();
void run() override;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InterprocessConnectionServer) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InterprocessConnectionServer)
}; };


+ 1
- 1
modules/juce_events/native/juce_win32_HiddenMessageWindow.h View File

@@ -128,7 +128,7 @@ private:
return DefWindowProc (h, message, wParam, lParam); return DefWindowProc (h, message, wParam, lParam);
} }
void timerCallback()
void timerCallback() override
{ {
stopTimer(); stopTimer();
systemDeviceChanged(); systemDeviceChanged();


+ 1
- 1
modules/juce_events/timers/juce_MultiTimer.cpp View File

@@ -31,7 +31,7 @@ public:
{ {
} }
void timerCallback()
void timerCallback() override
{ {
owner.timerCallback (timerId); owner.timerCallback (timerId);
} }


+ 3
- 3
modules/juce_events/timers/juce_Timer.cpp View File

@@ -46,7 +46,7 @@ public:
instance = nullptr; instance = nullptr;
} }
void run()
void run() override
{ {
uint32 lastTime = Time::getMillisecondCounter(); uint32 lastTime = Time::getMillisecondCounter();
MessageManager::MessageBase::Ptr messageToSend (new CallTimersMessage()); MessageManager::MessageBase::Ptr messageToSend (new CallTimersMessage());
@@ -192,7 +192,7 @@ private:
{ {
CallTimersMessage() {} CallTimersMessage() {}
void messageCallback()
void messageCallback() override
{ {
if (instance != nullptr) if (instance != nullptr)
instance->callTimers(); instance->callTimers();
@@ -272,7 +272,7 @@ private:
return firstTimer != nullptr ? firstTimer->countdownMs : 1000; return firstTimer != nullptr ? firstTimer->countdownMs : 1000;
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
startThread (7); startThread (7);
} }


+ 1
- 1
modules/juce_graphics/images/juce_ImageCache.cpp View File

@@ -67,7 +67,7 @@ public:
} }
} }
void timerCallback()
void timerCallback() override
{ {
const uint32 now = Time::getApproximateMillisecondCounter(); const uint32 now = Time::getApproximateMillisecondCounter();


+ 18
- 18
modules/juce_gui_basics/buttons/juce_Button.h View File

@@ -404,43 +404,43 @@ protected:
/** @internal */ /** @internal */
virtual void internalClickCallback (const ModifierKeys&); virtual void internalClickCallback (const ModifierKeys&);
/** @internal */ /** @internal */
void handleCommandMessage (int commandId);
void handleCommandMessage (int commandId) override;
/** @internal */ /** @internal */
void mouseEnter (const MouseEvent&);
void mouseEnter (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseExit (const MouseEvent&);
void mouseExit (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent&);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent&);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent&);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
bool keyPressed (const KeyPress&);
bool keyPressed (const KeyPress&) override;
/** @internal */ /** @internal */
bool keyPressed (const KeyPress&, Component*);
bool keyPressed (const KeyPress&, Component*) override;
/** @internal */ /** @internal */
bool keyStateChanged (bool isKeyDown, Component*);
bool keyStateChanged (bool isKeyDown, Component*) override;
/** @internal */ /** @internal */
using Component::keyStateChanged; using Component::keyStateChanged;
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void parentHierarchyChanged();
void parentHierarchyChanged() override;
/** @internal */ /** @internal */
void visibilityChanged();
void visibilityChanged() override;
/** @internal */ /** @internal */
void focusGained (FocusChangeType);
void focusGained (FocusChangeType) override;
/** @internal */ /** @internal */
void focusLost (FocusChangeType);
void focusLost (FocusChangeType) override;
/** @internal */ /** @internal */
void enablementChanged();
void enablementChanged() override;
/** @internal */ /** @internal */
void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo&);
void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo&) override;
/** @internal */ /** @internal */
void applicationCommandListChanged();
void applicationCommandListChanged() override;
/** @internal */ /** @internal */
void valueChanged (Value&);
void valueChanged (Value&) override;
private: private:
//============================================================================== //==============================================================================


+ 5
- 5
modules/juce_gui_basics/buttons/juce_DrawableButton.h View File

@@ -160,15 +160,15 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown);
void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown) override;
/** @internal */ /** @internal */
void buttonStateChanged();
void buttonStateChanged() override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void enablementChanged();
void enablementChanged() override;
/** @internal */ /** @internal */
void colourChanged();
void colourChanged() override;
private: private:
//============================================================================== //==============================================================================


+ 2
- 2
modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h View File

@@ -311,8 +311,8 @@ private:
ApplicationCommandTarget* firstTarget; ApplicationCommandTarget* firstTarget;
void sendListenerInvokeCallback (const ApplicationCommandTarget::InvocationInfo&); void sendListenerInvokeCallback (const ApplicationCommandTarget::InvocationInfo&);
void handleAsyncUpdate();
void globalFocusChanged (Component*);
void handleAsyncUpdate() override;
void globalFocusChanged (Component*) override;
#if JUCE_CATCH_DEPRECATED_CODE_MISUSE #if JUCE_CATCH_DEPRECATED_CODE_MISUSE
// This is just here to cause a compile error in old code that hasn't been changed to use the new // This is just here to cause a compile error in old code that hasn't been changed to use the new


+ 1
- 1
modules/juce_gui_basics/components/juce_Component.cpp View File

@@ -690,7 +690,7 @@ class StandardCachedComponentImage : public CachedComponentImage
public: public:
StandardCachedComponentImage (Component& c) noexcept : owner (c) {} StandardCachedComponentImage (Component& c) noexcept : owner (c) {}
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
const Rectangle<int> bounds (owner.getLocalBounds()); const Rectangle<int> bounds (owner.getLocalBounds());


+ 8
- 8
modules/juce_gui_basics/components/juce_Component.h View File

@@ -1453,7 +1453,7 @@ public:
the source component in which it occurred the source component in which it occurred
@see mouseEnter, mouseExit, mouseDrag, contains @see mouseEnter, mouseExit, mouseDrag, contains
*/ */
virtual void mouseMove (const MouseEvent& event);
virtual void mouseMove (const MouseEvent& event) override;
/** Called when the mouse first enters a component. /** Called when the mouse first enters a component.
@@ -1469,7 +1469,7 @@ public:
the source component in which it occurred the source component in which it occurred
@see mouseExit, mouseDrag, mouseMove, contains @see mouseExit, mouseDrag, mouseMove, contains
*/ */
virtual void mouseEnter (const MouseEvent& event);
virtual void mouseEnter (const MouseEvent& event) override;
/** Called when the mouse moves out of a component. /** Called when the mouse moves out of a component.
@@ -1484,7 +1484,7 @@ public:
the source component in which it occurred the source component in which it occurred
@see mouseEnter, mouseDrag, mouseMove, contains @see mouseEnter, mouseDrag, mouseMove, contains
*/ */
virtual void mouseExit (const MouseEvent& event);
virtual void mouseExit (const MouseEvent& event) override;
/** Called when a mouse button is pressed. /** Called when a mouse button is pressed.
@@ -1499,7 +1499,7 @@ public:
the source component in which it occurred the source component in which it occurred
@see mouseUp, mouseDrag, mouseDoubleClick, contains @see mouseUp, mouseDrag, mouseDoubleClick, contains
*/ */
virtual void mouseDown (const MouseEvent& event);
virtual void mouseDown (const MouseEvent& event) override;
/** Called when the mouse is moved while a button is held down. /** Called when the mouse is moved while a button is held down.
@@ -1511,7 +1511,7 @@ public:
the source component in which it occurred the source component in which it occurred
@see mouseDown, mouseUp, mouseMove, contains, setDragRepeatInterval @see mouseDown, mouseUp, mouseMove, contains, setDragRepeatInterval
*/ */
virtual void mouseDrag (const MouseEvent& event);
virtual void mouseDrag (const MouseEvent& event) override;
/** Called when a mouse button is released. /** Called when a mouse button is released.
@@ -1526,7 +1526,7 @@ public:
the source component in which it occurred the source component in which it occurred
@see mouseDown, mouseDrag, mouseDoubleClick, contains @see mouseDown, mouseDrag, mouseDoubleClick, contains
*/ */
virtual void mouseUp (const MouseEvent& event);
virtual void mouseUp (const MouseEvent& event) override;
/** Called when a mouse button has been double-clicked on a component. /** Called when a mouse button has been double-clicked on a component.
@@ -1538,7 +1538,7 @@ public:
the source component in which it occurred the source component in which it occurred
@see mouseDown, mouseUp @see mouseDown, mouseUp
*/ */
virtual void mouseDoubleClick (const MouseEvent& event);
virtual void mouseDoubleClick (const MouseEvent& event) override;
/** Called when the mouse-wheel is moved. /** Called when the mouse-wheel is moved.
@@ -1556,7 +1556,7 @@ public:
@param wheel details about the mouse wheel movement @param wheel details about the mouse wheel movement
*/ */
virtual void mouseWheelMove (const MouseEvent& event, virtual void mouseWheelMove (const MouseEvent& event,
const MouseWheelDetails& wheel);
const MouseWheelDetails& wheel) override;
/** Called when a pinch-to-zoom mouse-gesture is used. /** Called when a pinch-to-zoom mouse-gesture is used.


+ 1
- 1
modules/juce_gui_basics/components/juce_Desktop.cpp View File

@@ -192,7 +192,7 @@ class MouseDragAutoRepeater : public Timer
public: public:
MouseDragAutoRepeater() {} MouseDragAutoRepeater() {}
void timerCallback()
void timerCallback() override
{ {
Desktop& desktop = Desktop::getInstance(); Desktop& desktop = Desktop::getInstance();
int numMiceDown = 0; int numMiceDown = 0;


+ 2
- 2
modules/juce_gui_basics/components/juce_Desktop.h View File

@@ -411,7 +411,7 @@ private:
ComponentAnimator animator; ComponentAnimator animator;
void timerCallback();
void timerCallback() override;
void resetTimer(); void resetTimer();
ListenerList <MouseListener>& getMouseListeners(); ListenerList <MouseListener>& getMouseListeners();
@@ -422,7 +422,7 @@ private:
void setKioskComponent (Component*, bool enableOrDisable, bool allowMenusAndBars); void setKioskComponent (Component*, bool enableOrDisable, bool allowMenusAndBars);
void triggerFocusCallback(); void triggerFocusCallback();
void handleAsyncUpdate();
void handleAsyncUpdate() override;
Desktop(); Desktop();
~Desktop(); ~Desktop();


+ 1
- 1
modules/juce_gui_basics/components/juce_ModalComponentManager.h View File

@@ -127,7 +127,7 @@ protected:
~ModalComponentManager(); ~ModalComponentManager();
/** @internal */ /** @internal */
void handleAsyncUpdate();
void handleAsyncUpdate() override;
private: private:
//============================================================================== //==============================================================================


+ 5
- 5
modules/juce_gui_basics/drawables/juce_DrawableImage.h View File

@@ -83,17 +83,17 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
bool hitTest (int x, int y);
bool hitTest (int x, int y) override;
/** @internal */ /** @internal */
Drawable* createCopy() const;
Drawable* createCopy() const override;
/** @internal */ /** @internal */
Rectangle<float> getDrawableBounds() const;
Rectangle<float> getDrawableBounds() const override;
/** @internal */ /** @internal */
void refreshFromValueTree (const ValueTree& tree, ComponentBuilder& builder); void refreshFromValueTree (const ValueTree& tree, ComponentBuilder& builder);
/** @internal */ /** @internal */
ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const;
ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const override;
/** @internal */ /** @internal */
static const Identifier valueTreeType; static const Identifier valueTreeType;


+ 3
- 3
modules/juce_gui_basics/drawables/juce_DrawableShape.h View File

@@ -145,11 +145,11 @@ public:
}; };
/** @internal */ /** @internal */
Rectangle<float> getDrawableBounds() const;
Rectangle<float> getDrawableBounds() const override;
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
bool hitTest (int x, int y);
bool hitTest (int x, int y) override;
protected: protected:
//============================================================================== //==============================================================================


+ 4
- 4
modules/juce_gui_basics/drawables/juce_DrawableText.h View File

@@ -90,17 +90,17 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
Drawable* createCopy() const;
Drawable* createCopy() const override;
/** @internal */ /** @internal */
void refreshFromValueTree (const ValueTree& tree, ComponentBuilder& builder); void refreshFromValueTree (const ValueTree& tree, ComponentBuilder& builder);
/** @internal */ /** @internal */
ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const;
ValueTree createValueTree (ComponentBuilder::ImageProvider* imageProvider) const override;
/** @internal */ /** @internal */
static const Identifier valueTreeType; static const Identifier valueTreeType;
/** @internal */ /** @internal */
Rectangle<float> getDrawableBounds() const;
Rectangle<float> getDrawableBounds() const override;
//============================================================================== //==============================================================================
/** Internally-used class for wrapping a DrawableText's state into a ValueTree. */ /** Internally-used class for wrapping a DrawableText's state into a ValueTree. */


+ 14
- 14
modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h View File

@@ -179,33 +179,33 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void buttonClicked (Button*);
void buttonClicked (Button*) override;
/** @internal */ /** @internal */
void comboBoxChanged (ComboBox*);
void comboBoxChanged (ComboBox*) override;
/** @internal */ /** @internal */
void textEditorTextChanged (TextEditor&);
void textEditorTextChanged (TextEditor&) override;
/** @internal */ /** @internal */
void textEditorReturnKeyPressed (TextEditor&);
void textEditorReturnKeyPressed (TextEditor&) override;
/** @internal */ /** @internal */
void textEditorEscapeKeyPressed (TextEditor&);
void textEditorEscapeKeyPressed (TextEditor&) override;
/** @internal */ /** @internal */
void textEditorFocusLost (TextEditor&);
void textEditorFocusLost (TextEditor&) override;
/** @internal */ /** @internal */
bool keyPressed (const KeyPress&);
bool keyPressed (const KeyPress&) override;
/** @internal */ /** @internal */
void selectionChanged();
void selectionChanged() override;
/** @internal */ /** @internal */
void fileClicked (const File&, const MouseEvent&);
void fileClicked (const File&, const MouseEvent&) override;
/** @internal */ /** @internal */
void fileDoubleClicked (const File&);
void fileDoubleClicked (const File&) override;
/** @internal */ /** @internal */
void browserRootChanged (const File&);
void browserRootChanged (const File&) override;
/** @internal */ /** @internal */
bool isFileSuitable (const File&) const;
bool isFileSuitable (const File&) const override;
/** @internal */ /** @internal */
bool isDirectorySuitable (const File&) const;
bool isDirectorySuitable (const File&) const override;
/** @internal */ /** @internal */
FilePreviewComponent* getPreviewComponent() const noexcept; FilePreviewComponent* getPreviewComponent() const noexcept;


+ 2
- 2
modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp View File

@@ -46,13 +46,13 @@ public:
setInterceptsMouseClicks (false, true); setInterceptsMouseClicks (false, true);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
text.draw (g, getLocalBounds().reduced (6) text.draw (g, getLocalBounds().reduced (6)
.removeFromTop ((int) text.getHeight()).toFloat()); .removeFromTop ((int) text.getHeight()).toFloat());
} }
void resized()
void resized() override
{ {
const int buttonHeight = 26; const int buttonHeight = 26;


+ 5
- 5
modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp View File

@@ -102,7 +102,7 @@ public:
} }
//============================================================================== //==============================================================================
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
getLookAndFeel().drawFileBrowserRow (g, getWidth(), getHeight(), getLookAndFeel().drawFileBrowserRow (g, getWidth(), getHeight(),
file.getFileName(), file.getFileName(),
@@ -111,13 +111,13 @@ public:
index, owner); index, owner);
} }
void mouseDown (const MouseEvent& e)
void mouseDown (const MouseEvent& e) override
{ {
owner.selectRowsBasedOnModifierKeys (index, e.mods, false); owner.selectRowsBasedOnModifierKeys (index, e.mods, false);
owner.sendMouseClickMessage (file, e); owner.sendMouseClickMessage (file, e);
} }
void mouseDoubleClick (const MouseEvent&)
void mouseDoubleClick (const MouseEvent&) override
{ {
owner.sendDoubleClickMessage (file); owner.sendDoubleClickMessage (file);
} }
@@ -168,13 +168,13 @@ public:
} }
} }
int useTimeSlice()
int useTimeSlice() override
{ {
updateIcon (false); updateIcon (false);
return -1; return -1;
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
repaint(); repaint();
} }


+ 11
- 12
modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h View File

@@ -80,28 +80,27 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
int getNumRows();
int getNumRows() override;
/** @internal */ /** @internal */
void paintListBoxItem (int rowNumber, Graphics& g, int width, int height, bool rowIsSelected);
void paintListBoxItem (int rowNumber, Graphics& g, int width, int height, bool rowIsSelected) override;
/** @internal */ /** @internal */
void deleteKeyPressed (int lastRowSelected);
void deleteKeyPressed (int lastRowSelected) override;
/** @internal */ /** @internal */
void returnKeyPressed (int lastRowSelected);
void returnKeyPressed (int lastRowSelected) override;
/** @internal */ /** @internal */
void listBoxItemDoubleClicked (int row, const MouseEvent&);
void listBoxItemDoubleClicked (int row, const MouseEvent&) override;
/** @internal */ /** @internal */
void selectedRowsChanged (int lastRowSelected);
void selectedRowsChanged (int lastRowSelected) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
bool isInterestedInFileDrag (const StringArray& files);
bool isInterestedInFileDrag (const StringArray&) override;
/** @internal */ /** @internal */
void filesDropped (const StringArray& files, int, int);
void filesDropped (const StringArray& files, int, int) override;
/** @internal */ /** @internal */
void buttonClicked (Button* button);
void buttonClicked (Button*) override;
private: private:
//============================================================================== //==============================================================================


+ 12
- 12
modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp View File

@@ -66,13 +66,13 @@ public:
} }
//============================================================================== //==============================================================================
bool mightContainSubItems() { return isDirectory; }
String getUniqueName() const { return file.getFullPathName(); }
int getItemHeight() const { return 22; }
bool mightContainSubItems() override { return isDirectory; }
String getUniqueName() const override { return file.getFullPathName(); }
int getItemHeight() const override { return 22; }
var getDragSourceDescription() { return owner.getDragAndDropDescription(); }
var getDragSourceDescription() override { return owner.getDragAndDropDescription(); }
void itemOpennessChanged (bool isNowOpen)
void itemOpennessChanged (bool isNowOpen) override
{ {
if (isNowOpen) if (isNowOpen)
{ {
@@ -150,7 +150,7 @@ public:
return false; return false;
} }
void changeListenerCallback (ChangeBroadcaster*)
void changeListenerCallback (ChangeBroadcaster*) override
{ {
rebuildItemsFromContentList(); rebuildItemsFromContentList();
} }
@@ -167,7 +167,7 @@ public:
} }
} }
void paintItem (Graphics& g, int width, int height)
void paintItem (Graphics& g, int width, int height) override
{ {
if (file != File::nonexistent) if (file != File::nonexistent)
{ {
@@ -184,30 +184,30 @@ public:
indexInContentsList, owner); indexInContentsList, owner);
} }
void itemClicked (const MouseEvent& e)
void itemClicked (const MouseEvent& e) override
{ {
owner.sendMouseClickMessage (file, e); owner.sendMouseClickMessage (file, e);
} }
void itemDoubleClicked (const MouseEvent& e)
void itemDoubleClicked (const MouseEvent& e) override
{ {
TreeViewItem::itemDoubleClicked (e); TreeViewItem::itemDoubleClicked (e);
owner.sendDoubleClickMessage (file); owner.sendDoubleClickMessage (file);
} }
void itemSelectionChanged (bool)
void itemSelectionChanged (bool) override
{ {
owner.sendSelectionChangeMessage(); owner.sendSelectionChangeMessage();
} }
int useTimeSlice()
int useTimeSlice() override
{ {
updateIcon (false); updateIcon (false);
return -1; return -1;
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
owner.repaint(); owner.repaint();
} }


+ 10
- 10
modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h View File

@@ -180,19 +180,19 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paintOverChildren (Graphics& g);
void paintOverChildren (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void lookAndFeelChanged();
void lookAndFeelChanged() override;
/** @internal */ /** @internal */
bool isInterestedInFileDrag (const StringArray& files);
bool isInterestedInFileDrag (const StringArray&) override;
/** @internal */ /** @internal */
void filesDropped (const StringArray& files, int, int);
void filesDropped (const StringArray&, int, int) override;
/** @internal */ /** @internal */
void fileDragEnter (const StringArray& files, int, int);
void fileDragEnter (const StringArray&, int, int) override;
/** @internal */ /** @internal */
void fileDragExit (const StringArray& files);
void fileDragExit (const StringArray&) override;
private: private:
//============================================================================== //==============================================================================
@@ -205,9 +205,9 @@ private:
ListenerList <FilenameComponentListener> listeners; ListenerList <FilenameComponentListener> listeners;
File defaultBrowseFile; File defaultBrowseFile;
void comboBoxChanged (ComboBox*);
void buttonClicked (Button* button);
void handleAsyncUpdate();
void comboBoxChanged (ComboBox*) override;
void buttonClicked (Button* button) override;
void handleAsyncUpdate() override;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilenameComponent) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilenameComponent)
}; };


+ 3
- 3
modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h View File

@@ -48,11 +48,11 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void selectedFileChanged (const File& newSelectedFile);
void selectedFileChanged (const File& newSelectedFile) override;
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void timerCallback();
void timerCallback() override;
private: private:
File fileToLoad; File fileToLoad;


+ 2
- 2
modules/juce_gui_basics/keyboard/juce_CaretComponent.h View File

@@ -67,13 +67,13 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
private: private:
Component* owner; Component* owner;
bool shouldBeShown() const; bool shouldBeShown() const;
void timerCallback();
void timerCallback() override;
JUCE_DECLARE_NON_COPYABLE (CaretComponent) JUCE_DECLARE_NON_COPYABLE (CaretComponent)
}; };


+ 1
- 1
modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp View File

@@ -154,7 +154,7 @@ public:
toBehind (&c); toBehind (&c);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
g.setOpacity (1.0f); g.setOpacity (1.0f);
g.drawImage (image, 0, 0, getWidth(), getHeight(), g.drawImage (image, 0, 0, getWidth(), getHeight(),


+ 5
- 5
modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp View File

@@ -217,7 +217,7 @@ public:
addAndMakeVisible (comp); addAndMakeVisible (comp);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
const Rectangle<int> area (getWidth(), getHeaderSize()); const Rectangle<int> area (getWidth(), getHeaderSize());
g.reduceClipRegion (area); g.reduceClipRegion (area);
@@ -226,18 +226,18 @@ public:
getPanel(), *component); getPanel(), *component);
} }
void resized()
void resized() override
{ {
component->setBounds (getLocalBounds().withTop (getHeaderSize())); component->setBounds (getLocalBounds().withTop (getHeaderSize()));
} }
void mouseDown (const MouseEvent&)
void mouseDown (const MouseEvent&) override
{ {
mouseDownY = getY(); mouseDownY = getY();
dragStartSizes = getPanel().getFittedSizes(); dragStartSizes = getPanel().getFittedSizes();
} }
void mouseDrag (const MouseEvent& e)
void mouseDrag (const MouseEvent& e) override
{ {
ConcertinaPanel& panel = getPanel(); ConcertinaPanel& panel = getPanel();
panel.setLayout (dragStartSizes.withMovedPanel (panel.holders.indexOf (this), panel.setLayout (dragStartSizes.withMovedPanel (panel.holders.indexOf (this),
@@ -245,7 +245,7 @@ public:
panel.getHeight()), false); panel.getHeight()), false);
} }
void mouseDoubleClick (const MouseEvent&)
void mouseDoubleClick (const MouseEvent&) override
{ {
getPanel().panelHeaderDoubleClicked (component); getPanel().panelHeaderDoubleClicked (component);
} }


+ 1
- 1
modules/juce_gui_basics/layout/juce_ConcertinaPanel.h View File

@@ -93,7 +93,7 @@ public:
void setPanelHeaderSize (Component* panelComponent, int headerSize); void setPanelHeaderSize (Component* panelComponent, int headerSize);
private: private:
void resized();
void resized() override;
class PanelHolder; class PanelHolder;
struct PanelSizes; struct PanelSizes;


+ 3
- 3
modules/juce_gui_basics/layout/juce_GroupComponent.h View File

@@ -86,11 +86,11 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void enablementChanged();
void enablementChanged() override;
/** @internal */ /** @internal */
void colourChanged();
void colourChanged() override;
private: private:
String text; String text;


+ 3
- 3
modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h View File

@@ -277,11 +277,11 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void componentNameChanged (Component&);
void componentNameChanged (Component&) override;
private: private:
//============================================================================== //==============================================================================


+ 7
- 7
modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h View File

@@ -167,19 +167,19 @@ public:
protected: protected:
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void mouseEnter (const MouseEvent&);
void mouseEnter (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseMove (const MouseEvent&);
void mouseMove (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent&);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent&);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent&);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
bool hitTest (int x, int y);
bool hitTest (int x, int y) override;
private: private:
WeakReference<Component> component; WeakReference<Component> component;


+ 5
- 5
modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h View File

@@ -70,15 +70,15 @@ public:
protected: protected:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent& e);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent& e);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent& e);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
bool hitTest (int x, int y);
bool hitTest (int x, int y) override;
private: private:
//============================================================================== //==============================================================================


+ 4
- 4
modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h View File

@@ -80,13 +80,13 @@ public:
protected: protected:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent& e);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent& e);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent& e);
void mouseUp (const MouseEvent&) override;
private: private:
WeakReference<Component> component; WeakReference<Component> component;


+ 10
- 10
modules/juce_gui_basics/layout/juce_ScrollBar.h View File

@@ -296,21 +296,21 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
bool keyPressed (const KeyPress&);
bool keyPressed (const KeyPress&) override;
/** @internal */ /** @internal */
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&);
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override;
/** @internal */ /** @internal */
void lookAndFeelChanged();
void lookAndFeelChanged() override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent&);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent&);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent&);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
private: private:
//============================================================================== //==============================================================================
@@ -325,9 +325,9 @@ private:
ScopedPointer<ScrollbarButton> upButton, downButton; ScopedPointer<ScrollbarButton> upButton, downButton;
ListenerList <Listener> listeners; ListenerList <Listener> listeners;
void handleAsyncUpdate();
void handleAsyncUpdate() override;
void updateThumbPosition(); void updateThumbPosition();
void timerCallback();
void timerCallback() override;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ScrollBar) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ScrollBar)
}; };


+ 3
- 3
modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h View File

@@ -77,11 +77,11 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent& e);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent& e);
void mouseDrag (const MouseEvent&) override;
private: private:


+ 3
- 3
modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp View File

@@ -157,17 +157,17 @@ public:
setInterceptsMouseClicks (false, false); setInterceptsMouseClicks (false, false);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
getLookAndFeel().drawTabAreaBehindFrontButton (owner, g, getWidth(), getHeight()); getLookAndFeel().drawTabAreaBehindFrontButton (owner, g, getWidth(), getHeight());
} }
void enablementChanged()
void enablementChanged() override
{ {
repaint(); repaint();
} }
void buttonClicked (Button*)
void buttonClicked (Button*) override
{ {
owner.showExtraItemsMenu(); owner.showExtraItemsMenu();
} }


+ 3
- 3
modules/juce_gui_basics/layout/juce_TabbedComponent.h View File

@@ -187,11 +187,11 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void lookAndFeelChanged();
void lookAndFeelChanged() override;
protected: protected:
//============================================================================== //==============================================================================


+ 13
- 14
modules/juce_gui_basics/menus/juce_MenuBarComponent.h View File

@@ -73,30 +73,29 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void mouseEnter (const MouseEvent& e);
void mouseEnter (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseExit (const MouseEvent& e);
void mouseExit (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDown (const MouseEvent& e);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent& e);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent& e);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseMove (const MouseEvent& e);
void mouseMove (const MouseEvent&) override;
/** @internal */ /** @internal */
void handleCommandMessage (int commandId);
void handleCommandMessage (int commandId) override;
/** @internal */ /** @internal */
bool keyPressed (const KeyPress& key);
bool keyPressed (const KeyPress&) override;
/** @internal */ /** @internal */
void menuBarItemsChanged (MenuBarModel* menuBarModel);
void menuBarItemsChanged (MenuBarModel*) override;
/** @internal */ /** @internal */
void menuCommandInvoked (MenuBarModel* menuBarModel,
const ApplicationCommandTarget::InvocationInfo& info);
void menuCommandInvoked (MenuBarModel*, const ApplicationCommandTarget::InvocationInfo&) override;
private: private:
//============================================================================== //==============================================================================
@@ -111,7 +110,7 @@ private:
void setItemUnderMouse (int index); void setItemUnderMouse (int index);
void setOpenItem (int index); void setOpenItem (int index);
void updateItemUnderMouse (Point<int>); void updateItemUnderMouse (Point<int>);
void timerCallback();
void timerCallback() override;
void repaintMenuItem (int index); void repaintMenuItem (int index);
void menuDismissed (int topLevelIndex, int itemId); void menuDismissed (int topLevelIndex, int itemId);
static void menuBarMenuDismissedCallback (int, MenuBarComponent*, int); static void menuBarMenuDismissedCallback (int, MenuBarComponent*, int);


+ 3
- 3
modules/juce_gui_basics/menus/juce_MenuBarModel.h View File

@@ -166,11 +166,11 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo& info);
void applicationCommandInvoked (const ApplicationCommandTarget::InvocationInfo& info) override;
/** @internal */ /** @internal */
void applicationCommandListChanged();
void applicationCommandListChanged() override;
/** @internal */ /** @internal */
void handleAsyncUpdate();
void handleAsyncUpdate() override;
private: private:
ApplicationCommandManager* manager; ApplicationCommandManager* manager;


+ 14
- 14
modules/juce_gui_basics/menus/juce_PopupMenu.cpp View File

@@ -153,7 +153,7 @@ public:
idealWidth, idealHeight); idealWidth, idealHeight);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (itemInfo.customComp == nullptr) if (itemInfo.customComp == nullptr)
{ {
@@ -180,7 +180,7 @@ public:
} }
} }
void resized()
void resized() override
{ {
if (Component* const child = getChildComponent (0)) if (Component* const child = getChildComponent (0))
child->setBounds (getLocalBounds().reduced (2, 0)); child->setBounds (getLocalBounds().reduced (2, 0));
@@ -290,7 +290,7 @@ public:
} }
//============================================================================== //==============================================================================
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (isOpaque()) if (isOpaque())
g.fillAll (Colours::white); g.fillAll (Colours::white);
@@ -298,7 +298,7 @@ public:
getLookAndFeel().drawPopupMenuBackground (g, getWidth(), getHeight()); getLookAndFeel().drawPopupMenuBackground (g, getWidth(), getHeight());
} }
void paintOverChildren (Graphics& g)
void paintOverChildren (Graphics& g) override
{ {
if (canScroll()) if (canScroll())
{ {
@@ -362,18 +362,18 @@ public:
} }
//============================================================================== //==============================================================================
void mouseMove (const MouseEvent&) { timerCallback(); }
void mouseDown (const MouseEvent&) { timerCallback(); }
void mouseDrag (const MouseEvent&) { timerCallback(); }
void mouseUp (const MouseEvent&) { timerCallback(); }
void mouseMove (const MouseEvent&) override { timerCallback(); }
void mouseDown (const MouseEvent&) override { timerCallback(); }
void mouseDrag (const MouseEvent&) override { timerCallback(); }
void mouseUp (const MouseEvent&) override { timerCallback(); }
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel)
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel) override
{ {
alterChildYPos (roundToInt (-10.0f * wheel.deltaY * PopupMenuSettings::scrollZone)); alterChildYPos (roundToInt (-10.0f * wheel.deltaY * PopupMenuSettings::scrollZone));
lastMousePos = Point<int> (-1, -1); lastMousePos = Point<int> (-1, -1);
} }
bool keyPressed (const KeyPress& key)
bool keyPressed (const KeyPress& key) override
{ {
if (key.isKeyCode (KeyPress::downKey)) if (key.isKeyCode (KeyPress::downKey))
{ {
@@ -432,7 +432,7 @@ public:
return true; return true;
} }
void inputAttemptWhenModal()
void inputAttemptWhenModal() override
{ {
WeakReference<Component> deletionChecker (this); WeakReference<Component> deletionChecker (this);
@@ -461,7 +461,7 @@ public:
} }
} }
void handleCommandMessage (int commandId)
void handleCommandMessage (int commandId) override
{ {
Component::handleCommandMessage (commandId); Component::handleCommandMessage (commandId);
@@ -470,7 +470,7 @@ public:
} }
//============================================================================== //==============================================================================
void timerCallback()
void timerCallback() override
{ {
if (! isVisible()) if (! isVisible())
return; return;
@@ -1303,7 +1303,7 @@ public:
setName (name); setName (name);
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
g.setFont (getLookAndFeel().getPopupMenuFont().boldened()); g.setFont (getLookAndFeel().getPopupMenuFont().boldened());
g.setColour (findColour (PopupMenu::headerTextColourId)); g.setColour (findColour (PopupMenu::headerTextColourId));


+ 1
- 1
modules/juce_gui_basics/misc/juce_BubbleComponent.h View File

@@ -152,7 +152,7 @@ protected:
public: public:
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
private: private:
Rectangle<int> content; Rectangle<int> content;


+ 2
- 2
modules/juce_gui_basics/misc/juce_DropShadower.cpp View File

@@ -44,13 +44,13 @@ public:
} }
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (Component* c = target) if (Component* c = target)
shadow.drawForRectangle (g, getLocalArea (c, c->getLocalBounds())); shadow.drawForRectangle (g, getLocalArea (c, c->getLocalBounds()));
} }
void resized()
void resized() override
{ {
repaint(); // (needed for correct repainting) repaint(); // (needed for correct repainting)
} }


+ 4
- 4
modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp View File

@@ -72,7 +72,7 @@ public:
} }
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (isOpaque()) if (isOpaque())
g.fillAll (Colours::white); g.fillAll (Colours::white);
@@ -81,7 +81,7 @@ public:
g.drawImageAt (image, 0, 0); g.drawImageAt (image, 0, 0);
} }
void mouseUp (const MouseEvent& e)
void mouseUp (const MouseEvent& e) override
{ {
if (e.originalComponent != this) if (e.originalComponent != this)
{ {
@@ -114,7 +114,7 @@ public:
} }
} }
void mouseDrag (const MouseEvent& e)
void mouseDrag (const MouseEvent& e) override
{ {
if (e.originalComponent != this) if (e.originalComponent != this)
updateLocation (true, e.getScreenPosition()); updateLocation (true, e.getScreenPosition());
@@ -157,7 +157,7 @@ public:
} }
} }
void timerCallback()
void timerCallback() override
{ {
if (sourceDetails.sourceComponent == nullptr) if (sourceDetails.sourceComponent == nullptr)
{ {


+ 2
- 2
modules/juce_gui_basics/mouse/juce_LassoComponent.h View File

@@ -207,7 +207,7 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
getLookAndFeel().drawLasso (g, *this); getLookAndFeel().drawLasso (g, *this);
@@ -218,7 +218,7 @@ public:
} }
/** @internal */ /** @internal */
bool hitTest (int, int) { return false; }
bool hitTest (int, int) override { return false; }
private: private:
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_gui_basics/mouse/juce_MouseInputSource.cpp View File

@@ -362,7 +362,7 @@ public:
triggerAsyncUpdate(); triggerAsyncUpdate();
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
setScreenPos (lastScreenPos, jmax (lastTime, Time::getCurrentTime()), true); setScreenPos (lastScreenPos, jmax (lastTime, Time::getCurrentTime()), true);
} }


+ 1
- 1
modules/juce_gui_basics/native/juce_linux_Windowing.cpp View File

@@ -1805,7 +1805,7 @@ private:
#endif #endif
} }
void timerCallback()
void timerCallback() override
{ {
#if JUCE_USE_XSHM #if JUCE_USE_XSHM
if (shmPaintsPending != 0) if (shmPaintsPending != 0)


+ 3
- 3
modules/juce_gui_basics/native/juce_mac_Windowing.mm View File

@@ -72,7 +72,7 @@ private:
const char* button2; const char* button2;
const char* button3; const char* button3;
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
const int result = getResult(); const int result = getResult();
@@ -250,7 +250,7 @@ public:
timerCallback(); timerCallback();
} }
void timerCallback()
void timerCallback() override
{ {
if (Process::isForegroundProcess()) if (Process::isForegroundProcess())
{ {
@@ -291,7 +291,7 @@ public:
timerCallback(); timerCallback();
} }
void timerCallback()
void timerCallback() override
{ {
if (Process::isForegroundProcess()) if (Process::isForegroundProcess())
UpdateSystemActivity (1 /*UsrActivity*/); UpdateSystemActivity (1 /*UsrActivity*/);


+ 2
- 2
modules/juce_gui_basics/native/juce_win32_FileChooser.cpp View File

@@ -101,12 +101,12 @@ namespace FileChooserHelpers
setSize (jlimit (20, 800, customComp->getWidth()), customComp->getHeight()); setSize (jlimit (20, 800, customComp->getWidth()), customComp->getHeight());
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
g.fillAll (Colours::lightgrey); g.fillAll (Colours::lightgrey);
} }
void resized()
void resized() override
{ {
if (Component* const c = getChildComponent(0)) if (Component* const c = getChildComponent(0))
c->setBounds (getLocalBounds()); c->setBounds (getLocalBounds());


+ 3
- 3
modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -1123,7 +1123,7 @@ private:
return image; return image;
} }
void timerCallback()
void timerCallback() override
{ {
stopTimer(); stopTimer();
image = Image::null; image = Image::null;
@@ -2923,7 +2923,7 @@ public:
return (r == IDYES || r == IDOK) ? 1 : (r == IDNO ? 2 : 0); return (r == IDYES || r == IDOK) ? 1 : (r == IDNO ? 2 : 0);
} }
void handleAsyncUpdate()
void handleAsyncUpdate() override
{ {
const int result = getResult(); const int result = getResult();
@@ -3040,7 +3040,7 @@ public:
timerCallback(); timerCallback();
} }
void timerCallback()
void timerCallback() override
{ {
if (Process::isForegroundProcess()) if (Process::isForegroundProcess())
{ {


+ 3
- 3
modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h View File

@@ -79,11 +79,11 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void refresh();
void refresh() override;
/** @internal */ /** @internal */
void buttonClicked (Button*);
void buttonClicked (Button*) override;
private: private:
ToggleButton button; ToggleButton button;


+ 3
- 3
modules/juce_gui_basics/properties/juce_PropertyComponent.h View File

@@ -96,15 +96,15 @@ public:
@see LookAndFeel::drawPropertyComponentBackground(), LookAndFeel::drawPropertyComponentLabel() @see LookAndFeel::drawPropertyComponentBackground(), LookAndFeel::drawPropertyComponentLabel()
*/ */
void paint (Graphics& g);
void paint (Graphics&) override;
/** The default resize method positions any child component to the right of this /** The default resize method positions any child component to the right of this
one, based on the look and feel's default label size. one, based on the look and feel's default label size.
*/ */
void resized();
void resized() override;
/** By default, this just repaints the component. */ /** By default, this just repaints the component. */
void enablementChanged();
void enablementChanged() override;
protected: protected:
/** Used by the PropertyPanel to determine how high this component needs to be. /** Used by the PropertyPanel to determine how high this component needs to be.


+ 5
- 5
modules/juce_gui_basics/properties/juce_PropertyPanel.cpp View File

@@ -46,13 +46,13 @@ public:
propertyComps.clear(); propertyComps.clear();
} }
void paint (Graphics& g)
void paint (Graphics& g) override
{ {
if (titleHeight > 0) if (titleHeight > 0)
getLookAndFeel().drawPropertyPanelSectionHeader (g, getName(), isOpen(), getWidth(), titleHeight); getLookAndFeel().drawPropertyPanelSectionHeader (g, getName(), isOpen(), getWidth(), titleHeight);
} }
void resized()
void resized() override
{ {
int y = titleHeight; int y = titleHeight;
@@ -102,7 +102,7 @@ public:
propertyComps.getUnchecked (i)->refresh(); propertyComps.getUnchecked (i)->refresh();
} }
void mouseUp (const MouseEvent& e)
void mouseUp (const MouseEvent& e) override
{ {
if (e.getMouseDownX() < titleHeight if (e.getMouseDownX() < titleHeight
&& e.x < titleHeight && e.x < titleHeight
@@ -113,7 +113,7 @@ public:
} }
} }
void mouseDoubleClick (const MouseEvent& e)
void mouseDoubleClick (const MouseEvent& e) override
{ {
if (e.y < titleHeight) if (e.y < titleHeight)
setOpen (! isOpen()); setOpen (! isOpen());
@@ -133,7 +133,7 @@ class PropertyPanel::PropertyHolderComponent : public Component
public: public:
PropertyHolderComponent() {} PropertyHolderComponent() {}
void paint (Graphics&) {}
void paint (Graphics&) override {}
void updateLayout (int width) void updateLayout (int width)
{ {


+ 2
- 2
modules/juce_gui_basics/properties/juce_PropertyPanel.h View File

@@ -144,9 +144,9 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
private: private:
class SectionComponent; class SectionComponent;


+ 16
- 16
modules/juce_gui_basics/widgets/juce_ComboBox.h View File

@@ -339,37 +339,37 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void labelTextChanged (Label*);
void labelTextChanged (Label*) override;
/** @internal */ /** @internal */
void enablementChanged();
void enablementChanged() override;
/** @internal */ /** @internal */
void colourChanged();
void colourChanged() override;
/** @internal */ /** @internal */
void focusGained (Component::FocusChangeType cause);
void focusGained (Component::FocusChangeType) override;
/** @internal */ /** @internal */
void focusLost (Component::FocusChangeType cause);
void focusLost (Component::FocusChangeType) override;
/** @internal */ /** @internal */
void handleAsyncUpdate();
void handleAsyncUpdate() override;
/** @internal */ /** @internal */
String getTooltip() { return label->getTooltip(); }
String getTooltip() override { return label->getTooltip(); }
/** @internal */ /** @internal */
void mouseDown (const MouseEvent&);
void mouseDown (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDrag (const MouseEvent&);
void mouseDrag (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent&);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
void lookAndFeelChanged();
void lookAndFeelChanged() override;
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
bool keyStateChanged (bool isKeyDown);
bool keyStateChanged (bool) override;
/** @internal */ /** @internal */
bool keyPressed (const KeyPress&);
bool keyPressed (const KeyPress&) override;
/** @internal */ /** @internal */
void valueChanged (Value&);
void valueChanged (Value&) override;
private: private:
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_gui_basics/widgets/juce_ImageComponent.cpp View File

@@ -65,7 +65,7 @@ const Image& ImageComponent::getImage() const
return image; return image;
} }
const RectanglePlacement ImageComponent::getImagePlacement() const
RectanglePlacement ImageComponent::getImagePlacement() const
{ {
return placement; return placement;
} }


+ 2
- 2
modules/juce_gui_basics/widgets/juce_ImageComponent.h View File

@@ -64,11 +64,11 @@ public:
void setImagePlacement (const RectanglePlacement& newPlacement); void setImagePlacement (const RectanglePlacement& newPlacement);
/** Returns the current image placement. */ /** Returns the current image placement. */
const RectanglePlacement getImagePlacement() const;
RectanglePlacement getImagePlacement() const;
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics& g);
void paint (Graphics&) override;
private: private:
Image image; Image image;


+ 17
- 17
modules/juce_gui_basics/widgets/juce_Label.h View File

@@ -274,39 +274,39 @@ protected:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent&);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
void mouseDoubleClick (const MouseEvent&);
void mouseDoubleClick (const MouseEvent&) override;
/** @internal */ /** @internal */
void componentMovedOrResized (Component&, bool wasMoved, bool wasResized);
void componentMovedOrResized (Component&, bool wasMoved, bool wasResized) override;
/** @internal */ /** @internal */
void componentParentHierarchyChanged (Component&);
void componentParentHierarchyChanged (Component&) override;
/** @internal */ /** @internal */
void componentVisibilityChanged (Component&);
void componentVisibilityChanged (Component&) override;
/** @internal */ /** @internal */
void inputAttemptWhenModal();
void inputAttemptWhenModal() override;
/** @internal */ /** @internal */
void focusGained (FocusChangeType);
void focusGained (FocusChangeType) override;
/** @internal */ /** @internal */
void enablementChanged();
void enablementChanged() override;
/** @internal */ /** @internal */
KeyboardFocusTraverser* createFocusTraverser();
KeyboardFocusTraverser* createFocusTraverser() override;
/** @internal */ /** @internal */
void textEditorTextChanged (TextEditor&);
void textEditorTextChanged (TextEditor&) override;
/** @internal */ /** @internal */
void textEditorReturnKeyPressed (TextEditor&);
void textEditorReturnKeyPressed (TextEditor&) override;
/** @internal */ /** @internal */
void textEditorEscapeKeyPressed (TextEditor&);
void textEditorEscapeKeyPressed (TextEditor&) override;
/** @internal */ /** @internal */
void textEditorFocusLost (TextEditor&);
void textEditorFocusLost (TextEditor&) override;
/** @internal */ /** @internal */
void colourChanged();
void colourChanged() override;
/** @internal */ /** @internal */
void valueChanged (Value&);
void valueChanged (Value&) override;
/** @internal */ /** @internal */
void callChangeListeners(); void callChangeListeners();


+ 9
- 9
modules/juce_gui_basics/widgets/juce_ListBox.h View File

@@ -526,23 +526,23 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
bool keyPressed (const KeyPress&);
bool keyPressed (const KeyPress&) override;
/** @internal */ /** @internal */
bool keyStateChanged (bool isKeyDown);
bool keyStateChanged (bool isKeyDown) override;
/** @internal */ /** @internal */
void paint (Graphics&);
void paint (Graphics&) override;
/** @internal */ /** @internal */
void paintOverChildren (Graphics&);
void paintOverChildren (Graphics&) override;
/** @internal */ /** @internal */
void resized();
void resized() override;
/** @internal */ /** @internal */
void visibilityChanged();
void visibilityChanged() override;
/** @internal */ /** @internal */
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&);
void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override;
/** @internal */ /** @internal */
void mouseUp (const MouseEvent&);
void mouseUp (const MouseEvent&) override;
/** @internal */ /** @internal */
void colourChanged();
void colourChanged() override;
/** @internal */ /** @internal */
void startDragAndDrop (const MouseEvent&, const var& dragDescription, bool allowDraggingToOtherWindows); void startDragAndDrop (const MouseEvent&, const var& dragDescription, bool allowDraggingToOtherWindows);


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save