Browse Source

Avoided a couple of warnings about missing override specifiers.

tags/2021-05-28
jules 10 years ago
parent
commit
a4526eae3f
2 changed files with 5 additions and 3 deletions
  1. +2
    -0
      modules/juce_gui_basics/application/juce_Application.h
  2. +3
    -3
      modules/juce_gui_basics/menus/juce_PopupMenu.cpp

+ 2
- 0
modules/juce_gui_basics/application/juce_Application.h View File

@@ -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.


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

@@ -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<HelperClasses::ItemComponent*> (getParentComponent()))
if (HelperClasses::ItemComponent* const mic = findParentComponentOfClass<HelperClasses::ItemComponent>())
{
if (HelperClasses::MenuWindow* const pmw = dynamic_cast<HelperClasses::MenuWindow*> (mic->getParentComponent()))
if (HelperClasses::MenuWindow* const pmw = mic->findParentComponentOfClass<HelperClasses::MenuWindow>())
{
pmw->dismissMenu (&mic->itemInfo);
}


Loading…
Cancel
Save