From a4526eae3f611cbec63a1e0408df45ea7e08bcad Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 8 Jul 2015 11:12:05 +0100 Subject: [PATCH] Avoided a couple of warnings about missing override specifiers. --- modules/juce_gui_basics/application/juce_Application.h | 2 ++ modules/juce_gui_basics/menus/juce_PopupMenu.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/juce_gui_basics/application/juce_Application.h b/modules/juce_gui_basics/application/juce_Application.h index 1647ce63b6..175502d524 100644 --- a/modules/juce_gui_basics/application/juce_Application.h +++ b/modules/juce_gui_basics/application/juce_Application.h @@ -111,11 +111,13 @@ public: static JUCEApplication* JUCE_CALLTYPE getInstance() noexcept; //============================================================================== + #if DOXYGEN /** Returns the application's name. */ virtual const String getApplicationName() = 0; /** Returns the application's version number. */ virtual const String getApplicationVersion() = 0; + #endif /** Checks whether multiple instances of the app are allowed. diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp index 8dcd514e52..3084643c4b 100644 --- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp +++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp @@ -1219,7 +1219,7 @@ public: getLookAndFeel().drawPopupMenuSectionHeader (g, getLocalBounds(), getName()); } - void getIdealSize (int& idealWidth, int& idealHeight) + void getIdealSize (int& idealWidth, int& idealHeight) override { getLookAndFeel().getIdealPopupMenuItemSize (getName(), false, -1, idealWidth, idealHeight); idealHeight += idealHeight / 2; @@ -1698,9 +1698,9 @@ void PopupMenu::CustomComponent::setHighlighted (bool shouldBeHighlighted) void PopupMenu::CustomComponent::triggerMenuItem() { - if (HelperClasses::ItemComponent* const mic = dynamic_cast (getParentComponent())) + if (HelperClasses::ItemComponent* const mic = findParentComponentOfClass()) { - if (HelperClasses::MenuWindow* const pmw = dynamic_cast (mic->getParentComponent())) + if (HelperClasses::MenuWindow* const pmw = mic->findParentComponentOfClass()) { pmw->dismissMenu (&mic->itemInfo); }