| @@ -97,7 +97,7 @@ public: | |||
| { | |||
| ModuleFolderChecker() {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (IntrojucerApp* const app = dynamic_cast<IntrojucerApp*> (JUCEApplication::getInstance())) | |||
| app->makeSureUserHasSelectedModuleFolder(); | |||
| @@ -282,7 +282,7 @@ public: | |||
| setClickingTogglesState (true); | |||
| } | |||
| void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) | |||
| void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) override | |||
| { | |||
| if (document->paintStatesEnabled [background]) | |||
| { | |||
| @@ -114,7 +114,7 @@ void ProjectTreeViewBase::triggerAsyncRename (const Project::Item& itemToRename) | |||
| RenameMessage (TreeView* const t, const Project::Item& i) | |||
| : tree (t), itemToRename (i) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (tree != nullptr) | |||
| if (ProjectTreeViewBase* root = dynamic_cast <ProjectTreeViewBase*> (tree->getRootItem())) | |||
| @@ -70,7 +70,7 @@ public: | |||
| } | |||
| } | |||
| void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel) | |||
| void mouseWheelMove (const MouseEvent&, const MouseWheelDetails& wheel) override | |||
| { | |||
| if (thumbnail.getTotalLength() > 0) | |||
| { | |||
| @@ -86,7 +86,7 @@ public: | |||
| } | |||
| } | |||
| void paint (Graphics& g) | |||
| void paint (Graphics& g) override | |||
| { | |||
| g.fillAll (Colours::white); | |||
| g.setColour (Colours::lightblue); | |||
| @@ -103,18 +103,18 @@ public: | |||
| } | |||
| } | |||
| void changeListenerCallback (ChangeBroadcaster*) | |||
| void changeListenerCallback (ChangeBroadcaster*) override | |||
| { | |||
| // this method is called by the thumbnail when it has changed, so we should repaint it.. | |||
| repaint(); | |||
| } | |||
| bool isInterestedInFileDrag (const StringArray& /*files*/) | |||
| bool isInterestedInFileDrag (const StringArray& /*files*/) override | |||
| { | |||
| return true; | |||
| } | |||
| void filesDropped (const StringArray& files, int /*x*/, int /*y*/) | |||
| void filesDropped (const StringArray& files, int /*x*/, int /*y*/) override | |||
| { | |||
| AudioDemoPlaybackPage* demoPage = findParentComponentOfClass<AudioDemoPlaybackPage>(); | |||
| @@ -122,22 +122,22 @@ public: | |||
| demoPage->showFile (File (files[0])); | |||
| } | |||
| void mouseDown (const MouseEvent& e) | |||
| void mouseDown (const MouseEvent& e) override | |||
| { | |||
| mouseDrag (e); | |||
| } | |||
| void mouseDrag (const MouseEvent& e) | |||
| void mouseDrag (const MouseEvent& e) override | |||
| { | |||
| transportSource.setPosition (jmax (0.0, xToTime ((float) e.x))); | |||
| } | |||
| void mouseUp (const MouseEvent&) | |||
| void mouseUp (const MouseEvent&) override | |||
| { | |||
| transportSource.start(); | |||
| } | |||
| void timerCallback() | |||
| void timerCallback() override | |||
| { | |||
| currentPositionMarker.setVisible (transportSource.isPlaying() || isMouseButtonDown()); | |||
| @@ -232,7 +232,7 @@ public: | |||
| changeWidthToFitText(); | |||
| } | |||
| void clicked() | |||
| void clicked() override | |||
| { | |||
| ColourSelector* colourSelector = new ColourSelector(); | |||
| colourSelector->setName ("background"); | |||
| @@ -1354,15 +1354,15 @@ private: | |||
| [pluginWindow orderFront: nil]; | |||
| } | |||
| void resized() | |||
| void resized() override | |||
| { | |||
| if (Component* const child = getChildComponent (0)) | |||
| child->setBounds (getLocalBounds()); | |||
| } | |||
| void paint (Graphics&) {} | |||
| void paint (Graphics&) override {} | |||
| void childBoundsChanged (Component*) | |||
| void childBoundsChanged (Component*) override | |||
| { | |||
| if (! recursive) | |||
| { | |||
| @@ -1385,7 +1385,7 @@ private: | |||
| } | |||
| } | |||
| bool keyPressed (const KeyPress& kp) | |||
| bool keyPressed (const KeyPress& kp) override | |||
| { | |||
| if (! kp.getModifiers().isCommandDown()) | |||
| { | |||
| @@ -363,9 +363,9 @@ public: | |||
| #endif | |||
| } | |||
| void paint (Graphics&) {} | |||
| void paint (Graphics&) override {} | |||
| void resized() | |||
| void resized() override | |||
| { | |||
| if (juce::Component* const ed = getEditor()) | |||
| ed->setBounds (getLocalBounds()); | |||
| @@ -374,7 +374,7 @@ public: | |||
| } | |||
| #if JUCE_WINDOWS | |||
| void globalFocusChanged (juce::Component*) | |||
| void globalFocusChanged (juce::Component*) override | |||
| { | |||
| #if ! JucePlugin_EditorRequiresKeyboardFocus | |||
| if (hasKeyboardFocus (true)) | |||
| @@ -383,7 +383,7 @@ public: | |||
| } | |||
| #endif | |||
| void childBoundsChanged (juce::Component* child) | |||
| void childBoundsChanged (juce::Component* child) override | |||
| { | |||
| setSize (child->getWidth(), child->getHeight()); | |||
| child->setTopLeftPosition (0, 0); | |||
| @@ -394,10 +394,10 @@ public: | |||
| owner->updateSize(); | |||
| } | |||
| void userTriedToCloseWindow() {} | |||
| void userTriedToCloseWindow() override {} | |||
| #if JUCE_MAC && JucePlugin_EditorRequiresKeyboardFocus | |||
| bool keyPressed (const KeyPress& kp) | |||
| bool keyPressed (const KeyPress& kp) override | |||
| { | |||
| owner->updateSize(); | |||
| forwardCurrentKeyEventToHostWindow(); | |||
| @@ -241,13 +241,13 @@ public: | |||
| //============================================================================== | |||
| /** @internal */ | |||
| void closeButtonPressed() | |||
| void closeButtonPressed() override | |||
| { | |||
| JUCEApplication::quit(); | |||
| } | |||
| /** @internal */ | |||
| void buttonClicked (Button*) | |||
| void buttonClicked (Button*) override | |||
| { | |||
| if (filter != nullptr) | |||
| { | |||
| @@ -271,7 +271,7 @@ public: | |||
| } | |||
| /** @internal */ | |||
| void resized() | |||
| void resized() override | |||
| { | |||
| DocumentWindow::resized(); | |||
| optionsButton.setBounds (8, 6, 60, getTitleBarHeight() - 8); | |||
| @@ -1491,7 +1491,7 @@ private: | |||
| public: | |||
| MessageThreadCallback (bool& tr) : triggered (tr) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| triggered = true; | |||
| } | |||
| @@ -2401,7 +2401,7 @@ private: | |||
| } | |||
| } | |||
| void mouseEnter (const MouseEvent& e) | |||
| void mouseEnter (const MouseEvent& e) override | |||
| { | |||
| if (pluginWindow != 0) | |||
| { | |||
| @@ -2424,7 +2424,7 @@ private: | |||
| } | |||
| } | |||
| void mouseExit (const MouseEvent& e) | |||
| void mouseExit (const MouseEvent& e) override | |||
| { | |||
| if (pluginWindow != 0) | |||
| { | |||
| @@ -2448,7 +2448,7 @@ private: | |||
| } | |||
| } | |||
| void mouseMove (const MouseEvent& e) | |||
| void mouseMove (const MouseEvent& e) override | |||
| { | |||
| if (pluginWindow != 0) | |||
| { | |||
| @@ -2468,7 +2468,7 @@ private: | |||
| } | |||
| } | |||
| void mouseDrag (const MouseEvent& e) | |||
| void mouseDrag (const MouseEvent& e) override | |||
| { | |||
| if (pluginWindow != 0) | |||
| { | |||
| @@ -2489,7 +2489,7 @@ private: | |||
| } | |||
| } | |||
| void mouseUp (const MouseEvent& e) | |||
| void mouseUp (const MouseEvent& e) override | |||
| { | |||
| if (pluginWindow != 0) | |||
| { | |||
| @@ -2509,7 +2509,7 @@ private: | |||
| } | |||
| } | |||
| void mouseWheelMove (const MouseEvent& e, const MouseWheelDetails& wheel) | |||
| void mouseWheelMove (const MouseEvent& e, const MouseWheelDetails& wheel) override | |||
| { | |||
| if (pluginWindow != 0) | |||
| { | |||
| @@ -2621,7 +2621,7 @@ private: | |||
| ScopedPointer <NSViewComponent> innerWrapper; | |||
| #endif | |||
| void resized() | |||
| void resized() override | |||
| { | |||
| if (innerWrapper != nullptr) | |||
| innerWrapper->setSize (getWidth(), getHeight()); | |||
| @@ -77,17 +77,17 @@ public: | |||
| //============================================================================== | |||
| /** @internal */ | |||
| void resized(); | |||
| void resized() override; | |||
| /** @internal */ | |||
| bool isInterestedInFileDrag (const StringArray&); | |||
| bool isInterestedInFileDrag (const StringArray&) override; | |||
| /** @internal */ | |||
| void filesDropped (const StringArray&, int, int); | |||
| void filesDropped (const StringArray&, int, int) override; | |||
| /** @internal */ | |||
| int getNumRows(); | |||
| int getNumRows() override; | |||
| /** @internal */ | |||
| void paintListBoxItem (int row, Graphics&, int width, int height, bool rowIsSelected); | |||
| void paintListBoxItem (int row, Graphics&, int width, int height, bool rowIsSelected) override; | |||
| /** @internal */ | |||
| void deleteKeyPressed (int lastRowSelected); | |||
| void deleteKeyPressed (int lastRowSelected) override; | |||
| private: | |||
| //============================================================================== | |||
| @@ -114,8 +114,8 @@ private: | |||
| bool canShowSelectedFolder() const; | |||
| void removeMissingPlugins(); | |||
| void buttonClicked (Button*); | |||
| void changeListenerCallback (ChangeBroadcaster*); | |||
| void buttonClicked (Button*) override; | |||
| void changeListenerCallback (ChangeBroadcaster*) override; | |||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginListComponent) | |||
| }; | |||
| @@ -223,7 +223,7 @@ public: | |||
| setup.manager->removeChangeListener (this); | |||
| } | |||
| void resized() | |||
| void resized() override | |||
| { | |||
| const int lx = proportionOfWidth (0.35f); | |||
| const int w = proportionOfWidth (0.4f); | |||
| @@ -305,7 +305,7 @@ public: | |||
| } | |||
| } | |||
| void comboBoxChanged (ComboBox* comboBoxThatHasChanged) | |||
| void comboBoxChanged (ComboBox* comboBoxThatHasChanged) override | |||
| { | |||
| if (comboBoxThatHasChanged == nullptr) | |||
| return; | |||
| @@ -381,7 +381,7 @@ public: | |||
| return device->showControlPanel(); | |||
| } | |||
| void buttonClicked (Button* button) | |||
| void buttonClicked (Button* button) override | |||
| { | |||
| if (button == showAdvancedSettingsButton) | |||
| { | |||
| @@ -475,7 +475,7 @@ public: | |||
| setSize (getWidth(), getLowestY() + 4); | |||
| } | |||
| void changeListenerCallback (ChangeBroadcaster*) | |||
| void changeListenerCallback (ChangeBroadcaster*) override | |||
| { | |||
| updateAllControls(); | |||
| } | |||
| @@ -714,12 +714,12 @@ public: | |||
| repaint(); | |||
| } | |||
| int getNumRows() | |||
| int getNumRows() override | |||
| { | |||
| return items.size(); | |||
| } | |||
| void paintListBoxItem (int row, Graphics& g, int width, int height, bool rowIsSelected) | |||
| void paintListBoxItem (int row, Graphics& g, int width, int height, bool rowIsSelected) override | |||
| { | |||
| if (isPositiveAndBelow (row, items.size())) | |||
| { | |||
| @@ -760,7 +760,7 @@ public: | |||
| } | |||
| } | |||
| void listBoxItemClicked (int row, const MouseEvent& e) | |||
| void listBoxItemClicked (int row, const MouseEvent& e) override | |||
| { | |||
| selectRow (row); | |||
| @@ -768,12 +768,12 @@ public: | |||
| flipEnablement (row); | |||
| } | |||
| void listBoxItemDoubleClicked (int row, const MouseEvent&) | |||
| void listBoxItemDoubleClicked (int row, const MouseEvent&) override | |||
| { | |||
| flipEnablement (row); | |||
| } | |||
| void returnKeyPressed (int row) | |||
| void returnKeyPressed (int row) override | |||
| { | |||
| flipEnablement (row); | |||
| } | |||
| @@ -97,8 +97,8 @@ private: | |||
| ScopedPointer<ComboBox> midiOutputSelector; | |||
| ScopedPointer<Label> midiInputsLabel, midiOutputLabel; | |||
| void comboBoxChanged (ComboBox*); | |||
| void changeListenerCallback (ChangeBroadcaster*); | |||
| void comboBoxChanged (ComboBox*) override; | |||
| void changeListenerCallback (ChangeBroadcaster*) override; | |||
| void updateAllControls(); | |||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDeviceSelectorComponent) | |||
| @@ -33,7 +33,7 @@ public: | |||
| setOpaque (true); | |||
| } | |||
| void clicked() | |||
| void clicked() override | |||
| { | |||
| int note = owner.getLowestVisibleKey(); | |||
| @@ -45,7 +45,7 @@ public: | |||
| owner.setLowestVisibleKey (note * 12); | |||
| } | |||
| void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) | |||
| void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) override | |||
| { | |||
| owner.drawUpDownButton (g, getWidth(), getHeight(), | |||
| isMouseOverButton, isButtonDown, | |||
| @@ -33,7 +33,7 @@ public: | |||
| listener (listener_) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (const ActionBroadcaster* const b = broadcaster) | |||
| if (b->actionListeners.contains (listener)) | |||
| @@ -27,7 +27,7 @@ class AsyncUpdater::AsyncUpdaterMessage : public CallbackMessage | |||
| public: | |||
| AsyncUpdaterMessage (AsyncUpdater& au) : owner (au) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (shouldDeliver.compareAndSetBool (0, 1)) | |||
| owner.handleAsyncUpdate(); | |||
| @@ -184,11 +184,11 @@ void InterprocessConnection::initialiseWithPipe (NamedPipe* const pipe_) | |||
| //============================================================================== | |||
| struct ConnectionStateMessage : public MessageManager::MessageBase | |||
| { | |||
| ConnectionStateMessage (InterprocessConnection* owner_, bool connectionMade_) noexcept | |||
| : owner (owner_), connectionMade (connectionMade_) | |||
| ConnectionStateMessage (InterprocessConnection* ipc, bool connected) noexcept | |||
| : owner (ipc), connectionMade (connected) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (InterprocessConnection* const ipc = owner) | |||
| { | |||
| @@ -237,7 +237,7 @@ struct DataDeliveryMessage : public Message | |||
| : owner (ipc), data (d) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (InterprocessConnection* const ipc = owner) | |||
| ipc->messageReceived (data); | |||
| @@ -54,7 +54,7 @@ public: | |||
| private: | |||
| friend class MessageListener; | |||
| WeakReference<MessageListener> recipient; | |||
| void messageCallback(); | |||
| void messageCallback() override; | |||
| // Avoid the leak-detector because for plugins, the host can unload our DLL with undelivered | |||
| // messages still in the system event queue. These aren't harmful, but can cause annoying assertions. | |||
| @@ -27,7 +27,7 @@ class MessageManager::QuitMessage : public MessageManager::MessageBase | |||
| public: | |||
| QuitMessage() {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (MessageManager* const mm = MessageManager::instance) | |||
| mm->quitMessageReceived = true; | |||
| @@ -134,7 +134,7 @@ public: | |||
| : result (nullptr), func (f), parameter (param) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| result = (*func) (parameter); | |||
| finished.signal(); | |||
| @@ -227,7 +227,7 @@ class MessageManagerLock::BlockingMessage : public MessageManager::MessageBase | |||
| public: | |||
| BlockingMessage() noexcept {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| lockedEvent.signal(); | |||
| releaseEvent.wait(); | |||
| @@ -68,7 +68,7 @@ void MessageManager::stopDispatchLoop() | |||
| { | |||
| QuitCallback() {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| android.activity.callVoidMethod (JuceAppActivity.finish); | |||
| } | |||
| @@ -65,18 +65,18 @@ public: | |||
| of (0, 0). | |||
| */ | |||
| virtual void setOrigin (int x, int y) = 0; | |||
| virtual void addTransform (const AffineTransform& transform) = 0; | |||
| virtual void addTransform (const AffineTransform&) = 0; | |||
| virtual float getScaleFactor() = 0; | |||
| virtual float getTargetDeviceScaleFactor() { return 1.0f; } | |||
| virtual bool clipToRectangle (const Rectangle<int>& r) = 0; | |||
| virtual bool clipToRectangleList (const RectangleList& clipRegion) = 0; | |||
| virtual void excludeClipRectangle (const Rectangle<int>& r) = 0; | |||
| virtual void clipToPath (const Path& path, const AffineTransform& transform) = 0; | |||
| virtual void clipToImageAlpha (const Image& sourceImage, const AffineTransform& transform) = 0; | |||
| virtual bool clipToRectangle (const Rectangle<int>&) = 0; | |||
| virtual bool clipToRectangleList (const RectangleList&) = 0; | |||
| virtual void excludeClipRectangle (const Rectangle<int>&) = 0; | |||
| virtual void clipToPath (const Path&, const AffineTransform&) = 0; | |||
| virtual void clipToImageAlpha (const Image&, const AffineTransform&) = 0; | |||
| virtual bool clipRegionIntersects (const Rectangle<int>& r) = 0; | |||
| virtual bool clipRegionIntersects (const Rectangle<int>&) = 0; | |||
| virtual Rectangle<int> getClipBounds() const = 0; | |||
| virtual bool isClipEmpty() const = 0; | |||
| @@ -87,23 +87,23 @@ public: | |||
| virtual void endTransparencyLayer() = 0; | |||
| //============================================================================== | |||
| virtual void setFill (const FillType& fillType) = 0; | |||
| virtual void setFill (const FillType&) = 0; | |||
| virtual void setOpacity (float newOpacity) = 0; | |||
| virtual void setInterpolationQuality (Graphics::ResamplingQuality quality) = 0; | |||
| virtual void setInterpolationQuality (Graphics::ResamplingQuality) = 0; | |||
| //============================================================================== | |||
| virtual void fillRect (const Rectangle<int>& r, bool replaceExistingContents) = 0; | |||
| virtual void fillPath (const Path& path, const AffineTransform& transform) = 0; | |||
| virtual void fillRect (const Rectangle<int>&, bool replaceExistingContents) = 0; | |||
| virtual void fillPath (const Path&, const AffineTransform&) = 0; | |||
| virtual void drawImage (const Image& sourceImage, const AffineTransform& transform) = 0; | |||
| virtual void drawImage (const Image&, const AffineTransform&) = 0; | |||
| virtual void drawLine (const Line <float>& line) = 0; | |||
| virtual void drawLine (const Line <float>&) = 0; | |||
| virtual void drawVerticalLine (int x, float top, float bottom) = 0; | |||
| virtual void drawHorizontalLine (int y, float left, float right) = 0; | |||
| virtual void setFont (const Font& newFont) = 0; | |||
| virtual void setFont (const Font&) = 0; | |||
| virtual const Font& getFont() = 0; | |||
| virtual void drawGlyph (int glyphNumber, const AffineTransform& transform) = 0; | |||
| virtual void drawGlyph (int glyphNumber, const AffineTransform&) = 0; | |||
| virtual bool drawTextLayout (const AttributedString&, const Rectangle<float>&) { return false; } | |||
| }; | |||
| @@ -46,47 +46,47 @@ public: | |||
| ~LowLevelGraphicsPostScriptRenderer(); | |||
| //============================================================================== | |||
| bool isVectorDevice() const; | |||
| void setOrigin (int x, int y); | |||
| void addTransform (const AffineTransform& transform); | |||
| float getScaleFactor(); | |||
| bool isVectorDevice() const override; | |||
| void setOrigin (int x, int y) override; | |||
| void addTransform (const AffineTransform&) override; | |||
| float getScaleFactor() override; | |||
| bool clipToRectangle (const Rectangle<int>& r); | |||
| bool clipToRectangleList (const RectangleList& clipRegion); | |||
| void excludeClipRectangle (const Rectangle<int>& r); | |||
| void clipToPath (const Path& path, const AffineTransform& transform); | |||
| void clipToImageAlpha (const Image& sourceImage, const AffineTransform& transform); | |||
| bool clipToRectangle (const Rectangle<int>&) override; | |||
| bool clipToRectangleList (const RectangleList&) override; | |||
| void excludeClipRectangle (const Rectangle<int>&) override; | |||
| void clipToPath (const Path&, const AffineTransform&) override; | |||
| void clipToImageAlpha (const Image&, const AffineTransform&) override; | |||
| void saveState(); | |||
| void restoreState(); | |||
| void saveState() override; | |||
| void restoreState() override; | |||
| void beginTransparencyLayer (float opacity); | |||
| void endTransparencyLayer(); | |||
| void beginTransparencyLayer (float) override; | |||
| void endTransparencyLayer() override; | |||
| bool clipRegionIntersects (const Rectangle<int>& r); | |||
| Rectangle<int> getClipBounds() const; | |||
| bool isClipEmpty() const; | |||
| bool clipRegionIntersects (const Rectangle<int>&) override; | |||
| Rectangle<int> getClipBounds() const override; | |||
| bool isClipEmpty() const override; | |||
| //============================================================================== | |||
| void setFill (const FillType& fillType); | |||
| void setOpacity (float opacity); | |||
| void setInterpolationQuality (Graphics::ResamplingQuality quality); | |||
| void setFill (const FillType&) override; | |||
| void setOpacity (float) override; | |||
| void setInterpolationQuality (Graphics::ResamplingQuality) override; | |||
| //============================================================================== | |||
| void fillRect (const Rectangle<int>& r, bool replaceExistingContents); | |||
| void fillPath (const Path& path, const AffineTransform& transform); | |||
| void fillRect (const Rectangle<int>&, bool replaceExistingContents) override; | |||
| void fillPath (const Path&, const AffineTransform&) override; | |||
| void drawImage (const Image& sourceImage, const AffineTransform& transform); | |||
| void drawImage (const Image&, const AffineTransform&) override; | |||
| void drawLine (const Line <float>& line); | |||
| void drawLine (const Line <float>&) override; | |||
| void drawVerticalLine (int x, float top, float bottom); | |||
| void drawHorizontalLine (int x, float top, float bottom); | |||
| void drawVerticalLine (int x, float top, float bottom) override; | |||
| void drawHorizontalLine (int x, float top, float bottom) override; | |||
| //============================================================================== | |||
| const Font& getFont(); | |||
| void setFont (const Font& newFont); | |||
| void drawGlyph (int glyphNumber, const AffineTransform& transform); | |||
| const Font& getFont() override; | |||
| void setFont (const Font&) override; | |||
| void drawGlyph (int glyphNumber, const AffineTransform&) override; | |||
| protected: | |||
| //============================================================================== | |||
| @@ -45,42 +45,41 @@ public: | |||
| const RectangleList& initialClip); | |||
| ~LowLevelGraphicsSoftwareRenderer(); | |||
| bool isVectorDevice() const; | |||
| void setOrigin (int x, int y); | |||
| void addTransform (const AffineTransform&); | |||
| float getScaleFactor(); | |||
| bool clipToRectangle (const Rectangle<int>&); | |||
| bool clipToRectangleList (const RectangleList&); | |||
| void excludeClipRectangle (const Rectangle<int>&); | |||
| void clipToPath (const Path&, const AffineTransform&); | |||
| void clipToImageAlpha (const Image&, const AffineTransform&); | |||
| bool clipRegionIntersects (const Rectangle<int>&); | |||
| Rectangle<int> getClipBounds() const; | |||
| bool isClipEmpty() const; | |||
| void saveState(); | |||
| void restoreState(); | |||
| void beginTransparencyLayer (float opacity); | |||
| void endTransparencyLayer(); | |||
| void setFill (const FillType&); | |||
| void setOpacity (float opacity); | |||
| void setInterpolationQuality (Graphics::ResamplingQuality); | |||
| void fillRect (const Rectangle<int>&, bool replaceExistingContents); | |||
| void fillPath (const Path&, const AffineTransform&); | |||
| void drawImage (const Image&, const AffineTransform&); | |||
| void drawLine (const Line <float>&); | |||
| void drawVerticalLine (int x, float top, float bottom); | |||
| void drawHorizontalLine (int x, float top, float bottom); | |||
| void setFont (const Font&); | |||
| const Font& getFont(); | |||
| void drawGlyph (int glyphNumber, float x, float y); | |||
| void drawGlyph (int glyphNumber, const AffineTransform&); | |||
| bool isVectorDevice() const override; | |||
| void setOrigin (int x, int y) override; | |||
| void addTransform (const AffineTransform&) override; | |||
| float getScaleFactor() override; | |||
| bool clipToRectangle (const Rectangle<int>&) override; | |||
| bool clipToRectangleList (const RectangleList&) override; | |||
| void excludeClipRectangle (const Rectangle<int>&) override; | |||
| void clipToPath (const Path&, const AffineTransform&) override; | |||
| void clipToImageAlpha (const Image&, const AffineTransform&) override; | |||
| bool clipRegionIntersects (const Rectangle<int>&) override; | |||
| Rectangle<int> getClipBounds() const override; | |||
| bool isClipEmpty() const override; | |||
| void saveState() override; | |||
| void restoreState() override; | |||
| void beginTransparencyLayer (float opacity) override; | |||
| void endTransparencyLayer() override; | |||
| void setFill (const FillType&) override; | |||
| void setOpacity (float opacity) override; | |||
| void setInterpolationQuality (Graphics::ResamplingQuality) override; | |||
| void fillRect (const Rectangle<int>&, bool replaceExistingContents) override; | |||
| void fillPath (const Path&, const AffineTransform&) override; | |||
| void drawImage (const Image&, const AffineTransform&) override; | |||
| void drawLine (const Line <float>&) override; | |||
| void drawVerticalLine (int x, float top, float bottom) override; | |||
| void drawHorizontalLine (int x, float top, float bottom) override; | |||
| void setFont (const Font&) override; | |||
| const Font& getFont() override; | |||
| void drawGlyph (int glyphNumber, const AffineTransform&) override; | |||
| const Image& getImage() const noexcept { return savedState->image; } | |||
| const RenderingHelpers::TranslationOrTransform& getTransform() const noexcept { return savedState->transform; } | |||
| @@ -117,13 +117,13 @@ public: | |||
| //============================================================================== | |||
| // The following methods implement the basic Typeface behaviour. | |||
| float getAscent() const; | |||
| float getDescent() const; | |||
| float getHeightToPointsFactor() const; | |||
| float getStringWidth (const String& text); | |||
| void getGlyphPositions (const String& text, Array <int>& glyphs, Array<float>& xOffsets); | |||
| bool getOutlineForGlyph (int glyphNumber, Path& path); | |||
| EdgeTable* getEdgeTableForGlyph (int glyphNumber, const AffineTransform& transform); | |||
| float getAscent() const override; | |||
| float getDescent() const override; | |||
| float getHeightToPointsFactor() const override; | |||
| float getStringWidth (const String&) override; | |||
| void getGlyphPositions (const String&, Array <int>& glyphs, Array<float>& xOffsets) override; | |||
| bool getOutlineForGlyph (int glyphNumber, Path&) override; | |||
| EdgeTable* getEdgeTableForGlyph (int glyphNumber, const AffineTransform&) override; | |||
| protected: | |||
| //============================================================================== | |||
| @@ -33,46 +33,45 @@ public: | |||
| ~CoreGraphicsContext(); | |||
| //============================================================================== | |||
| bool isVectorDevice() const { return false; } | |||
| void setOrigin (int x, int y); | |||
| void addTransform (const AffineTransform& transform); | |||
| float getScaleFactor(); | |||
| float getTargetDeviceScaleFactor() { return targetScale; } | |||
| bool clipToRectangle (const Rectangle<int>& r); | |||
| bool clipToRectangleList (const RectangleList& clipRegion); | |||
| void excludeClipRectangle (const Rectangle<int>& r); | |||
| void clipToPath (const Path& path, const AffineTransform& transform); | |||
| void clipToImageAlpha (const Image& sourceImage, const AffineTransform& transform); | |||
| bool clipRegionIntersects (const Rectangle<int>& r); | |||
| Rectangle<int> getClipBounds() const; | |||
| bool isClipEmpty() const; | |||
| bool isVectorDevice() const override { return false; } | |||
| void setOrigin (int x, int y) override; | |||
| void addTransform (const AffineTransform&) override; | |||
| float getScaleFactor() override; | |||
| float getTargetDeviceScaleFactor() override { return targetScale; } | |||
| bool clipToRectangle (const Rectangle<int>&) override; | |||
| bool clipToRectangleList (const RectangleList&) override; | |||
| void excludeClipRectangle (const Rectangle<int>&) override; | |||
| void clipToPath (const Path&, const AffineTransform&) override; | |||
| void clipToImageAlpha (const Image&, const AffineTransform&) override; | |||
| bool clipRegionIntersects (const Rectangle<int>&) override; | |||
| Rectangle<int> getClipBounds() const override; | |||
| bool isClipEmpty() const override; | |||
| //============================================================================== | |||
| void saveState(); | |||
| void restoreState(); | |||
| void beginTransparencyLayer (float opacity); | |||
| void endTransparencyLayer(); | |||
| void saveState() override; | |||
| void restoreState() override; | |||
| void beginTransparencyLayer (float opacity) override; | |||
| void endTransparencyLayer() override; | |||
| //============================================================================== | |||
| void setFill (const FillType& fillType); | |||
| void setOpacity (float newOpacity); | |||
| void setInterpolationQuality (Graphics::ResamplingQuality quality); | |||
| void setFill (const FillType&) override; | |||
| void setOpacity (float) override; | |||
| void setInterpolationQuality (Graphics::ResamplingQuality) override; | |||
| //============================================================================== | |||
| void fillRect (const Rectangle<int>& r, const bool replaceExistingContents); | |||
| void fillCGRect (const CGRect& cgRect, const bool replaceExistingContents); | |||
| void fillPath (const Path& path, const AffineTransform& transform); | |||
| void drawImage (const Image& sourceImage, const AffineTransform& transform); | |||
| void fillRect (const Rectangle<int>&, bool replaceExistingContents) override; | |||
| void fillPath (const Path&, const AffineTransform&) override; | |||
| void drawImage (const Image& sourceImage, const AffineTransform&) override; | |||
| //============================================================================== | |||
| void drawLine (const Line<float>& line); | |||
| void drawVerticalLine (const int x, float top, float bottom); | |||
| void drawHorizontalLine (const int y, float left, float right); | |||
| void setFont (const Font& newFont); | |||
| const Font& getFont(); | |||
| void drawGlyph (int glyphNumber, const AffineTransform& transform); | |||
| bool drawTextLayout (const AttributedString& text, const Rectangle<float>&); | |||
| void drawLine (const Line<float>&) override; | |||
| void drawVerticalLine (const int x, float top, float bottom) override; | |||
| void drawHorizontalLine (const int y, float left, float right) override; | |||
| void setFont (const Font&) override; | |||
| const Font& getFont() override; | |||
| void drawGlyph (int glyphNumber, const AffineTransform&) override; | |||
| bool drawTextLayout (const AttributedString&, const Rectangle<float>&) override; | |||
| private: | |||
| CGContextRef context; | |||
| @@ -109,12 +108,13 @@ private: | |||
| OwnedArray <SavedState> stateStack; | |||
| void drawGradient(); | |||
| void createPath (const Path& path) const; | |||
| void createPath (const Path& path, const AffineTransform& transform) const; | |||
| void createPath (const Path&) const; | |||
| void createPath (const Path&, const AffineTransform&) const; | |||
| void flip() const; | |||
| void applyTransform (const AffineTransform& transform) const; | |||
| void drawImage (const Image& sourceImage, const AffineTransform& transform, bool fillEntireClipAsTiles); | |||
| void applyTransform (const AffineTransform&) const; | |||
| void drawImage (const Image&, const AffineTransform&, bool fillEntireClipAsTiles); | |||
| bool clipToRectangleListWithoutTest (const RectangleList&); | |||
| void fillCGRect (const CGRect&, bool replaceExistingContents); | |||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CoreGraphicsContext) | |||
| }; | |||
| @@ -53,7 +53,7 @@ public: | |||
| ~ArrowButton(); | |||
| /** @internal */ | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown); | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown) override; | |||
| private: | |||
| Colour colour; | |||
| @@ -85,9 +85,8 @@ public: | |||
| void setOutline (Colour outlineColour, | |||
| float outlineStrokeWidth); | |||
| /** @internal */ | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown); | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown) override; | |||
| private: | |||
| //============================================================================== | |||
| @@ -90,9 +90,9 @@ public: | |||
| protected: | |||
| /** @internal */ | |||
| void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown); | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown) override; | |||
| /** @internal */ | |||
| void colourChanged(); | |||
| void colourChanged() override; | |||
| private: | |||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TextButton) | |||
| @@ -77,9 +77,9 @@ public: | |||
| protected: | |||
| //============================================================================== | |||
| /** @internal */ | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown); | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown) override; | |||
| /** @internal */ | |||
| void colourChanged(); | |||
| void colourChanged() override; | |||
| private: | |||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ToggleButton) | |||
| @@ -30,7 +30,7 @@ public: | |||
| { | |||
| } | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (ApplicationCommandTarget* const target = owner) | |||
| target->tryToInvoke (info, false); | |||
| @@ -214,11 +214,11 @@ public: | |||
| //============================================================================== | |||
| /** @internal */ | |||
| bool keyPressed (const KeyPress&, Component* originatingComponent); | |||
| bool keyPressed (const KeyPress&, Component*) override; | |||
| /** @internal */ | |||
| bool keyStateChanged (bool isKeyDown, Component* originatingComponent); | |||
| bool keyStateChanged (bool isKeyDown, Component*) override; | |||
| /** @internal */ | |||
| void globalFocusChanged (Component*); | |||
| void globalFocusChanged (Component*) override; | |||
| private: | |||
| //============================================================================== | |||
| @@ -241,7 +241,6 @@ private: | |||
| OwnedArray <KeyPressTime> keysDown; | |||
| void handleMessage (const Message&); | |||
| void invokeCommand (const CommandID, const KeyPress&, const bool isKeyDown, | |||
| const int millisecsSinceKeyPressed, Component* originator) const; | |||
| @@ -1638,7 +1638,7 @@ void Component::exitModalState (const int returnValue) | |||
| ExitModalStateMessage (Component* const c, const int res) | |||
| : target (c), result (res) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (target.get() != nullptr) // (get() required for VS2003 bug) | |||
| target->exitModalState (result); | |||
| @@ -2196,7 +2196,7 @@ void Component::postCommandMessage (const int commandId) | |||
| CustomCommandMessage (Component* const c, const int command) | |||
| : target (c), commandId (command) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (target.get() != nullptr) // (get() required for VS2003 bug) | |||
| target->handleCommandMessage (commandId); | |||
| @@ -250,7 +250,7 @@ protected: | |||
| #endif | |||
| private: | |||
| void nonConstDraw (Graphics& g, float opacity, const AffineTransform& transform); | |||
| void nonConstDraw (Graphics&, float opacity, const AffineTransform&); | |||
| Drawable& operator= (const Drawable&); | |||
| JUCE_LEAK_DETECTOR (Drawable) | |||
| @@ -85,14 +85,14 @@ private: | |||
| class ItemComponent; | |||
| void changeListenerCallback (ChangeBroadcaster*); | |||
| int getNumRows(); | |||
| void paintListBoxItem (int, Graphics&, int, int, bool); | |||
| Component* refreshComponentForRow (int rowNumber, bool isRowSelected, Component* existingComponentToUpdate); | |||
| void selectedRowsChanged (int lastRowSelected); | |||
| void deleteKeyPressed (int currentSelectedRow); | |||
| void returnKeyPressed (int currentSelectedRow); | |||
| void changeListenerCallback (ChangeBroadcaster*) override; | |||
| int getNumRows() override; | |||
| void paintListBoxItem (int, Graphics&, int, int, bool) override; | |||
| Component* refreshComponentForRow (int rowNumber, bool isRowSelected, Component* existingComponentToUpdate) override; | |||
| void selectedRowsChanged (int lastRowSelected) override; | |||
| void deleteKeyPressed (int currentSelectedRow) override; | |||
| void returnKeyPressed (int currentSelectedRow) override; | |||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileListComponent) | |||
| }; | |||
| @@ -31,13 +31,13 @@ public: | |||
| setWantsKeyboardFocus (false); | |||
| } | |||
| void paintButton (Graphics& g, bool over, bool down) | |||
| void paintButton (Graphics& g, bool over, bool down) override | |||
| { | |||
| getLookAndFeel().drawScrollbarButton (g, owner, getWidth(), getHeight(), | |||
| direction, owner.isVertical(), over, down); | |||
| } | |||
| void clicked() | |||
| void clicked() override | |||
| { | |||
| owner.moveScrollbarInSteps ((direction == 1 || direction == 2) ? 1 : -1); | |||
| } | |||
| @@ -106,15 +106,15 @@ public: | |||
| //============================================================================== | |||
| /** @internal */ | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown); | |||
| void paintButton (Graphics&, bool isMouseOverButton, bool isButtonDown) override; | |||
| /** @internal */ | |||
| void clicked (const ModifierKeys&); | |||
| void clicked (const ModifierKeys&) override; | |||
| /** @internal */ | |||
| bool hitTest (int x, int y); | |||
| bool hitTest (int x, int y) override; | |||
| /** @internal */ | |||
| void resized(); | |||
| void resized() override; | |||
| /** @internal */ | |||
| void childBoundsChanged (Component*); | |||
| void childBoundsChanged (Component*) override; | |||
| protected: | |||
| friend class TabbedButtonBar; | |||
| @@ -237,15 +237,15 @@ public: | |||
| //============================================================================== | |||
| /** @internal */ | |||
| void resized(); | |||
| void resized() override; | |||
| /** @internal */ | |||
| void scrollBarMoved (ScrollBar*, double newRangeStart); | |||
| void scrollBarMoved (ScrollBar*, double newRangeStart) override; | |||
| /** @internal */ | |||
| void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&); | |||
| void mouseWheelMove (const MouseEvent&, const MouseWheelDetails&) override; | |||
| /** @internal */ | |||
| bool keyPressed (const KeyPress&); | |||
| bool keyPressed (const KeyPress&) override; | |||
| /** @internal */ | |||
| void componentMovedOrResized (Component&, bool wasMoved, bool wasResized); | |||
| void componentMovedOrResized (Component&, bool wasMoved, bool wasResized) override; | |||
| /** @internal */ | |||
| bool useMouseWheelMoveIfNeeded (const MouseEvent&, const MouseWheelDetails&); | |||
| @@ -1832,7 +1832,7 @@ public: | |||
| } | |||
| //============================================================================== | |||
| void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) | |||
| void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) override | |||
| { | |||
| float alpha = isMouseOverButton ? (isButtonDown ? 1.0f : 0.8f) : 0.55f; | |||
| @@ -1234,13 +1234,13 @@ public: | |||
| addAndMakeVisible (comp); | |||
| } | |||
| void getIdealSize (int& idealWidth, int& idealHeight) | |||
| void getIdealSize (int& idealWidth, int& idealHeight) override | |||
| { | |||
| idealWidth = width; | |||
| idealHeight = height; | |||
| } | |||
| void resized() | |||
| void resized() override | |||
| { | |||
| if (Component* const child = getChildComponent(0)) | |||
| child->setBounds (getLocalBounds()); | |||
| @@ -242,7 +242,7 @@ private: | |||
| : files (f), canMoveFiles (canMove) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| DragAndDropContainer::performExternalDragDropOfFiles (files, canMoveFiles); | |||
| } | |||
| @@ -129,7 +129,7 @@ public: | |||
| { | |||
| ViewDeleter (const GlobalRef& view_) : view (view_) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| android.activity.callVoidMethod (JuceAppActivity.deleteView, view.get()); | |||
| } | |||
| @@ -163,7 +163,7 @@ public: | |||
| : view (view_), shouldBeVisible (shouldBeVisible_) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| view.callVoidMethod (ComponentPeerView.setVisible, shouldBeVisible); | |||
| } | |||
| @@ -197,7 +197,7 @@ public: | |||
| public: | |||
| ViewMover (const GlobalRef& v, const Rectangle<int>& r) : view (v), bounds (r) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| view.callVoidMethod (ComponentPeerView.layout, | |||
| bounds.getX(), bounds.getY(), bounds.getRight(), bounds.getBottom()); | |||
| @@ -429,7 +429,7 @@ public: | |||
| ViewRepainter (const GlobalRef& view_, const Rectangle<int>& area_) | |||
| : view (view_), area (area_) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| view.callVoidMethod (ComponentPeerView.invalidate, area.getX(), area.getY(), | |||
| area.getRight(), area.getBottom()); | |||
| @@ -954,7 +954,7 @@ public: | |||
| { | |||
| } | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (ComponentPeer::isValidPeer (peer)) | |||
| peer->repaint (rect); | |||
| @@ -437,7 +437,7 @@ private: | |||
| public: | |||
| AsyncMenuUpdater() {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (instance != nullptr) | |||
| instance->menuBarItemsChanged (nullptr); | |||
| @@ -454,7 +454,7 @@ private: | |||
| : commandId (commandId_), topLevelIndex (topLevelIndex_) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (instance != nullptr) | |||
| instance->invokeDirectly (commandId, topLevelIndex); | |||
| @@ -1150,7 +1150,7 @@ public: | |||
| : peer (p), rect (r) | |||
| {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (ComponentPeer::isValidPeer (peer)) | |||
| peer->repaint (rect); | |||
| @@ -39,18 +39,18 @@ public: | |||
| setColour (textColourId, owner.findColour (TextPropertyComponent::textColourId)); | |||
| } | |||
| bool isInterestedInFileDrag (const StringArray&) | |||
| bool isInterestedInFileDrag (const StringArray&) override | |||
| { | |||
| return true; | |||
| } | |||
| void filesDropped (const StringArray& files, int, int) | |||
| void filesDropped (const StringArray& files, int, int) override | |||
| { | |||
| setText (getText() + files.joinIntoString (isMultiline ? "\n" : ", "), sendNotificationSync); | |||
| showEditor(); | |||
| } | |||
| TextEditor* createEditorComponent() | |||
| TextEditor* createEditorComponent() override | |||
| { | |||
| TextEditor* const ed = Label::createEditorComponent(); | |||
| ed->setInputRestrictions (maxChars); | |||
| @@ -64,7 +64,7 @@ public: | |||
| return ed; | |||
| } | |||
| void textWasEdited() | |||
| void textWasEdited() override | |||
| { | |||
| owner.textWasEdited(); | |||
| } | |||
| @@ -368,7 +368,7 @@ public: | |||
| JUCE_DECLARE_NON_COPYABLE (DragInProgress) | |||
| }; | |||
| void buttonClicked (Button* button) | |||
| void buttonClicked (Button* button) override | |||
| { | |||
| if (style == IncDecButtons) | |||
| { | |||
| @@ -379,7 +379,7 @@ public: | |||
| } | |||
| } | |||
| void valueChanged (Value& value) | |||
| void valueChanged (Value& value) override | |||
| { | |||
| if (value.refersToSameSourceAs (currentValue)) | |||
| { | |||
| @@ -392,7 +392,7 @@ public: | |||
| setMaxValue (valueMax.getValue(), dontSendNotification, true); | |||
| } | |||
| void labelTextChanged (Label* label) | |||
| void labelTextChanged (Label* label) override | |||
| { | |||
| const double newValue = owner.snapValue (owner.getValueFromText (label->getText()), false); | |||
| @@ -315,7 +315,7 @@ public: | |||
| String getText() const; | |||
| /** Returns a section of the contents of the editor. */ | |||
| String getTextInRange (const Range<int>& textRange) const; | |||
| String getTextInRange (const Range<int>& textRange) const override; | |||
| /** Returns true if there are no characters in the editor. | |||
| This is far more efficient than calling getText().isEmpty(). | |||
| @@ -355,7 +355,7 @@ public: | |||
| @see setCaretPosition, getCaretPosition, setHighlightedRegion | |||
| */ | |||
| void insertTextAtCaret (const String& textToInsert); | |||
| void insertTextAtCaret (const String& textToInsert) override; | |||
| /** Deletes all the text from the editor. */ | |||
| void clear(); | |||
| @@ -562,7 +562,7 @@ public: | |||
| String allowedCharacters; | |||
| int maxLength; | |||
| String filterNewText (TextEditor&, const String&); | |||
| String filterNewText (TextEditor&, const String&) override; | |||
| JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LengthAndCharacterRestriction) | |||
| }; | |||
| @@ -187,9 +187,9 @@ public: | |||
| //============================================================================== | |||
| /** @internal */ | |||
| void paintButton (Graphics& g, bool isMouseOver, bool isMouseDown); | |||
| void paintButton (Graphics&, bool isMouseOver, bool isMouseDown) override; | |||
| /** @internal */ | |||
| void resized(); | |||
| void resized() override; | |||
| private: | |||
| friend class Toolbar; | |||
| @@ -415,7 +415,7 @@ namespace DragHelpers | |||
| public: | |||
| AsyncDropMessage (Component* c, const ComponentPeer::DragInfo& d) : target (c), info (d) {} | |||
| void messageCallback() | |||
| void messageCallback() override | |||
| { | |||
| if (Component* const c = target.get()) | |||
| { | |||
| @@ -25,9 +25,9 @@ | |||
| class DocumentWindow::ButtonListenerProxy : public ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug) | |||
| { | |||
| public: | |||
| ButtonListenerProxy (DocumentWindow& owner_) : owner (owner_) {} | |||
| ButtonListenerProxy (DocumentWindow& w) : owner (w) {} | |||
| void buttonClicked (Button* button) | |||
| void buttonClicked (Button* button) override | |||
| { | |||
| if (button == owner.getMinimiseButton()) owner.minimiseButtonPressed(); | |||
| else if (button == owner.getMaximiseButton()) owner.maximiseButtonPressed(); | |||
| @@ -90,7 +90,7 @@ public: | |||
| CodeDocument::Position getCaretPos() const { return caretPos; } | |||
| /** Returns the position of the caret, relative to the editor's origin. */ | |||
| Rectangle<int> getCaretRectangle(); | |||
| Rectangle<int> getCaretRectangle() override; | |||
| /** Moves the caret. | |||
| If selecting is true, the section of the document between the current | |||
| @@ -144,7 +144,7 @@ public: | |||
| void scrollToKeepCaretOnScreen(); | |||
| void scrollToKeepLinesOnScreen (Range<int> linesToShow); | |||
| void insertTextAtCaret (const String& textToInsert); | |||
| void insertTextAtCaret (const String& textToInsert) override; | |||
| void insertTabAtCaret(); | |||
| void indentSelection(); | |||
| @@ -129,7 +129,7 @@ public: | |||
| updateMarker(); | |||
| } | |||
| void resized() | |||
| void resized() override | |||
| { | |||
| colours = Image::null; | |||
| updateMarker(); | |||
| @@ -39,7 +39,7 @@ public: | |||
| : TRANS("click to change this key-mapping")); | |||
| } | |||
| void paintButton (Graphics& g, bool /*isOver*/, bool /*isDown*/) | |||
| void paintButton (Graphics& g, bool /*isOver*/, bool /*isDown*/) override | |||
| { | |||
| getLookAndFeel().drawKeymapChangeButton (g, getWidth(), getHeight(), *this, | |||
| keyNum >= 0 ? getName() : String::empty); | |||
| @@ -58,7 +58,7 @@ public: | |||
| } | |||
| } | |||
| void clicked() | |||
| void clicked() override | |||
| { | |||
| if (keyNum >= 0) | |||
| { | |||
| @@ -106,7 +106,7 @@ public: | |||
| grabKeyboardFocus(); | |||
| } | |||
| bool keyPressed (const KeyPress& key) | |||
| bool keyPressed (const KeyPress& key) override | |||
| { | |||
| lastPress = key; | |||
| String message (TRANS("Key") + ": " + owner.getDescriptionForKeyPress (key)); | |||
| @@ -123,7 +123,7 @@ public: | |||
| return true; | |||
| } | |||
| bool keyStateChanged (bool) | |||
| bool keyStateChanged (bool) override | |||
| { | |||
| return true; | |||
| } | |||