Accessibility: Make createAccessibilityHandler public to allow calls from derived classes

examples/DemoRunner/Source/UI/SettingsContent.h

@@ -236,12 +236,12 @@ private:
             audioSettings.setBounds (bounds);
         }
 
-    private:
         std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override
         {
             return createIgnoredAccessibilityHandler (*this);
         }
 
+    private:
         GraphicsSettingsGroup graphicsSettings;
         AudioSettingsGroup audioSettings;
     };

modules/juce_gui_basics/buttons/juce_Button.h

@@ -495,6 +495,8 @@ protected:
     void focusLost (FocusChangeType) override;
     /** @internal */
     void enablementChanged() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -522,7 +524,6 @@ private:
     bool triggerOnMouseDown = false;
     bool generateTooltip = false;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void checkToggleableState (bool wasToggleable);
 
     void repeatTimerCallback();

modules/juce_gui_basics/buttons/juce_HyperlinkButton.h

@@ -101,6 +101,9 @@ public:
     /** Returns the type of justification, as set in setJustificationType(). */
     Justification getJustificationType() const noexcept         { return justification; }
 
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
 protected:
     //==============================================================================
     /** @internal */
@@ -111,8 +114,6 @@ protected:
     void paintButton (Graphics&, bool, bool) override;
 
 private:
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
-
     //==============================================================================
     using Button::clicked;
     Font getFontToUse() const;

modules/juce_gui_basics/buttons/juce_ToggleButton.h

@@ -76,6 +76,9 @@ public:
         tickDisabledColourId    = 0x1006503   /**< The colour to use for the disabled tick mark and/or outline. */
     };
 
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
 protected:
     //==============================================================================
     /** @internal */
@@ -84,8 +87,6 @@ protected:
     void colourChanged() override;
 
 private:
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
-
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ToggleButton)
 };
 

modules/juce_gui_basics/components/juce_Component.h

@@ -2479,6 +2479,9 @@ public:
     /** Returns the accessibility handler for this component, or nullptr if this component is not
         accessible.
 
+        To customise the accessibility handler for a component, override
+        createAccessibilityHandler().
+
         @see setAccessible
     */
     AccessibilityHandler* getAccessibilityHandler();
@@ -2492,20 +2495,6 @@ public:
     void invalidateAccessibilityHandler();
 
     //==============================================================================
-   #ifndef DOXYGEN
-    [[deprecated ("Use the setFocusContainerType that takes a more descriptive enum.")]]
-    void setFocusContainer (bool shouldBeFocusContainer) noexcept
-    {
-        setFocusContainerType (shouldBeFocusContainer ? FocusContainerType::keyboardFocusContainer
-                                                      : FocusContainerType::none);
-    }
-
-    [[deprecated ("Use the contains that takes a Point<int>.")]]
-    void contains (int, int) = delete;
-   #endif
-
-private:
-    //==============================================================================
     /** Override this method to return a custom AccessibilityHandler for this component.
 
         The default implementation creates and returns a AccessibilityHandler object with an
@@ -2519,10 +2508,31 @@ private:
         its Component, so it's safe to store and use a reference back to the Component
         inside the AccessibilityHandler if necessary.
 
+        This function should rarely be called directly. If you need to query a component's
+        accessibility handler, it's normally better to call getAccessibilityHandler().
+        The exception to this rule is derived implementations of createAccessibilityHandler(),
+        which may find it useful to call the base class implementation, and then wrap or
+        modify the result.
+
         @see getAccessibilityHandler
     */
     virtual std::unique_ptr<AccessibilityHandler> createAccessibilityHandler();
 
+    //==============================================================================
+   #ifndef DOXYGEN
+    [[deprecated ("Use the setFocusContainerType that takes a more descriptive enum.")]]
+    void setFocusContainer (bool shouldBeFocusContainer) noexcept
+    {
+        setFocusContainerType (shouldBeFocusContainer ? FocusContainerType::keyboardFocusContainer
+                                                      : FocusContainerType::none);
+    }
+
+    [[deprecated ("Use the contains that takes a Point<int>.")]]
+    void contains (int, int) = delete;
+   #endif
+
+private:
+
     //==============================================================================
     friend class ComponentPeer;
     friend class MouseInputSourceInternal;

modules/juce_gui_basics/drawables/juce_DrawableImage.h

@@ -97,10 +97,11 @@ public:
     Rectangle<float> getDrawableBounds() const override;
     /** @internal */
     Path getOutlineAsPath() const override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     bool setImageInternal (const Image&);
 
     //==============================================================================

modules/juce_gui_basics/drawables/juce_DrawableText.h

@@ -98,6 +98,8 @@ public:
     Path getOutlineAsPath() const override;
     /** @internal */
     bool replaceColour (Colour originalColour, Colour replacementColour) override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -108,7 +110,6 @@ private:
     Colour colour;
     Justification justification;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void refreshBounds();
     Rectangle<int> getTextArea (float width, float height) const;
     AffineTransform getTextTransform (float width, float height) const;

modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h

@@ -252,6 +252,8 @@ public:
     FilePreviewComponent* getPreviewComponent() const noexcept;
     /** @internal */
     DirectoryContentsDisplayComponent* getDisplayComponent() const noexcept;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 protected:
     /** Returns a list of names and paths for the default places the user might want to look.
@@ -283,7 +285,6 @@ private:
     TimeSliceThread thread;
     bool wasProcessActive;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void timerCallback() override;
     void sendListenerChangeMessage();
     bool isFileOrDirSuitable (const File&) const;

modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h

@@ -52,13 +52,14 @@ public:
     void paint (Graphics&) override;
     /** @internal */
     void timerCallback() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     File fileToLoad;
     Image currentThumbnail;
     String currentDetails;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void getThumbSize (int& w, int& h) const;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ImagePreviewComponent)

modules/juce_gui_basics/layout/juce_ConcertinaPanel.h

@@ -119,8 +119,10 @@ public:
                                                 ConcertinaPanel&, Component&) = 0;
     };
 
-private:
+    /** @internal */
     std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
+private:
     void resized() override;
 
     class PanelHolder;

modules/juce_gui_basics/layout/juce_GroupComponent.h

@@ -98,10 +98,10 @@ public:
     void enablementChanged() override;
     /** @internal */
     void colourChanged() override;
-
-private:
+    /** @internal */
     std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
+private:
     String text;
     Justification justification;
 

modules/juce_gui_basics/layout/juce_ScrollBar.h

@@ -414,6 +414,8 @@ public:
     void parentHierarchyChanged() override;
     /** @internal */
     void setVisible (bool) override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -427,7 +429,6 @@ private:
     std::unique_ptr<ScrollbarButton> upButton, downButton;
     ListenerList<Listener> listeners;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void handleAsyncUpdate() override;
     void updateThumbPosition();
     void timerCallback() override;

modules/juce_gui_basics/layout/juce_SidePanel.h

@@ -195,6 +195,8 @@ public:
     void mouseDrag (const MouseEvent&) override;
     /** @internal */
     void mouseUp (const MouseEvent&) override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -221,7 +223,6 @@ private:
     bool shouldShowDismissButton = true;
 
     //==============================================================================
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void lookAndFeelChanged() override;
     void componentMovedOrResized (Component&, bool wasMoved, bool wasResized) override;
     void changeListenerCallback (ChangeBroadcaster*) override;

modules/juce_gui_basics/layout/juce_TabbedButtonBar.h

@@ -334,6 +334,8 @@ public:
     void resized() override;
     /** @internal */
     void lookAndFeelChanged() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 protected:
     //==============================================================================
@@ -362,7 +364,6 @@ private:
     std::unique_ptr<BehindFrontTabComp> behindFrontTab;
     std::unique_ptr<Button> extraTabsButton;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void showExtraItemsMenu();
     void updateTabPositions (bool animate);
 

modules/juce_gui_basics/layout/juce_TabbedComponent.h

@@ -197,6 +197,8 @@ public:
     void resized() override;
     /** @internal */
     void lookAndFeelChanged() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 protected:
     //==============================================================================
@@ -217,7 +219,6 @@ private:
     int tabDepth = 30, outlineThickness = 1, edgeIndent = 0;
 
     struct ButtonBar;
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void changeCallback (int newCurrentTabIndex, const String& newTabName);
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TabbedComponent)

modules/juce_gui_basics/layout/juce_Viewport.h

@@ -341,6 +341,7 @@ private:
     //==============================================================================
     class AccessibilityIgnoredComponent : public Component
     {
+    public:
         std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override
         {
             return createIgnoredAccessibilityHandler (*this);

modules/juce_gui_basics/menus/juce_BurgerMenuComponent.h

@@ -71,6 +71,8 @@ public:
 
     /** @internal */
     void lookAndFeelChanged() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -81,7 +83,6 @@ private:
         PopupMenu::Item item;
     };
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void refresh();
     void paint (Graphics&) override;
     int getNumRows() override;

modules/juce_gui_basics/menus/juce_MenuBarComponent.h

@@ -95,13 +95,14 @@ public:
     void menuBarItemsChanged (MenuBarModel*) override;
     /** @internal */
     void menuCommandInvoked (MenuBarModel*, const ApplicationCommandTarget::InvocationInfo&) override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
     class AccessibleItemComponent;
 
     //==============================================================================
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void timerCallback() override;
 
     int getItemAt (Point<int>);

modules/juce_gui_basics/misc/juce_JUCESplashScreen.h

@@ -55,8 +55,10 @@ public:
 
     static std::unique_ptr<Drawable> getSplashScreenLogo();
 
-private:
+    /** @internal */
     std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
+private:
     void paint (Graphics&) override;
     void timerCallback() override;
     void parentSizeChanged() override;

modules/juce_gui_basics/widgets/juce_ComboBox.h

@@ -419,6 +419,8 @@ public:
     void valueChanged (Value&) override;
     /** @internal */
     void parentHierarchyChanged() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
     //==============================================================================
    #ifndef DOXYGEN
@@ -448,7 +450,6 @@ private:
     String textWhenNothingSelected, noChoicesMessage;
     EditableState labelEditableState = editableUnknown;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     PopupMenu::Item* getItemForId (int) const noexcept;
     PopupMenu::Item* getItemForIndex (int) const noexcept;
     bool selectIfEnabled (int index);

modules/juce_gui_basics/widgets/juce_ImageComponent.h

@@ -68,10 +68,10 @@ public:
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;
-
-private:
+    /** @internal */
     std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
+private:
     Image image;
     RectanglePlacement placement;
 

modules/juce_gui_basics/widgets/juce_Label.h

@@ -282,6 +282,9 @@ public:
         virtual BorderSize<int> getLabelBorderSize (Label&) = 0;
     };
 
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
 protected:
     //==============================================================================
     /** Creates the TextEditor component that will be used when the user has clicked on the label.
@@ -356,7 +359,6 @@ private:
     bool lossOfFocusDiscardsChanges = false;
     bool leftOfOwnerComp = false;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     bool updateFromTextEditorContents (TextEditor&);
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Label)

modules/juce_gui_basics/widgets/juce_ListBox.h

@@ -593,6 +593,8 @@ public:
     /** @internal */
     void startDragAndDrop (const MouseEvent&, const SparseSet<int>& rowsToDrag,
                            const var& dragDescription, bool allowDraggingToOtherWindows);
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
     //==============================================================================
    #ifndef DOXYGEN
@@ -622,7 +624,6 @@ private:
 
     void assignModelPtr (ListBoxModel*);
     void checkModelPtrIsValid() const;
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     bool hasAccessibleHeaderComponent() const;
     void selectRowInternal (int rowNumber, bool dontScrollToShowThisRow,
                             bool deselectOthersFirst, bool isMouseClick);

modules/juce_gui_basics/widgets/juce_ProgressBar.h

@@ -117,6 +117,9 @@ public:
         virtual bool isProgressBarOpaque (ProgressBar&) = 0;
     };
 
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
 protected:
     //==============================================================================
     /** @internal */
@@ -135,7 +138,6 @@ private:
     String displayedMessage, currentMessage;
     uint32 lastCallbackTime;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void timerCallback() override;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProgressBar)

modules/juce_gui_basics/widgets/juce_Slider.h

@@ -993,6 +993,8 @@ public:
     void mouseEnter (const MouseEvent&) override;
     /** @internal */
     bool keyPressed (const KeyPress&) override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
     //==============================================================================
    #ifndef DOXYGEN
@@ -1014,7 +1016,6 @@ private:
     JUCE_PUBLIC_IN_DLL_BUILD (class Pimpl)
     std::unique_ptr<Pimpl> pimpl;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void init (SliderStyle, TextEntryBoxPosition);
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Slider)

modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h

@@ -418,6 +418,8 @@ public:
     void mouseUp (const MouseEvent&) override;
     /** @internal */
     MouseCursor getMouseCursor() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
     /** Can be overridden for more control over the pop-up menu behaviour. */
     virtual void showColumnChooserMenu (int columnIdClicked);
@@ -442,7 +444,6 @@ private:
     int columnIdBeingResized = 0, columnIdBeingDragged = 0, initialColumnWidth = 0;
     int columnIdUnderMouse = 0, draggingColumnOffset = 0, draggingColumnOriginalIndex = 0, lastDeliberateWidth = 0;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     ColumnInfo* getInfoForId (int columnId) const;
     int visibleIndexToTotalIndex (int visibleIndex) const;
     void sendColumnsChanged();

modules/juce_gui_basics/widgets/juce_TableListBox.h

@@ -326,6 +326,8 @@ public:
     void tableColumnDraggingChanged (TableHeaderComponent*, int) override;
     /** @internal */
     void resized() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -337,7 +339,6 @@ private:
     int columnIdNowBeingDragged = 0;
     bool autoSizeOptionsShown = true;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void updateColumnComponents() const;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TableListBox)

modules/juce_gui_basics/widgets/juce_TextEditor.h

@@ -743,6 +743,8 @@ public:
     void setTemporaryUnderlining (const Array<Range<int>>&) override;
     /** @internal */
     VirtualKeyboardType getKeyboardType() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 protected:
     //==============================================================================
@@ -838,7 +840,6 @@ private:
     ListenerList<Listener> listeners;
     Array<Range<int>> underlinedSections;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void moveCaret (int newCaretPos);
     void moveCaretTo (int newPosition, bool isSelecting);
     void recreateCaret();

modules/juce_gui_basics/widgets/juce_Toolbar.h

@@ -310,6 +310,8 @@ public:
     static ToolbarItemComponent* createItem (ToolbarItemFactory&, int itemId);
     /** @internal */
     static const char* const toolbarDragDescriptor;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -322,7 +324,6 @@ private:
     class Spacer;
     class CustomisationDialog;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void initMissingItemButton();
     void showMissingItems();
     void addItemInternal (ToolbarItemFactory& factory, int itemId, int insertIndex);

modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h

@@ -187,14 +187,14 @@ public:
     void paintButton (Graphics&, bool isMouseOver, bool isMouseDown) override;
     /** @internal */
     void resized() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     friend class Toolbar;
     class ItemDragAndDropOverlayComponent;
     friend class ItemDragAndDropOverlayComponent;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
-
     const int itemId;
     ToolbarEditingMode mode;
     Toolbar::ToolbarItemStyle toolbarStyle;

modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.h

@@ -60,6 +60,8 @@ public:
     //==============================================================================
     /** @internal */
     void resized() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     ToolbarItemFactory& factory;
@@ -68,7 +70,6 @@ private:
     OwnedArray<ToolbarItemComponent> items;
 
     friend class Toolbar;
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void replaceComponent (ToolbarItemComponent&);
     void addComponent (int itemId, int index);
 

modules/juce_gui_basics/widgets/juce_TreeView.h

@@ -921,6 +921,8 @@ public:
     void itemDragExit (const SourceDetails&) override;
     /** @internal */
     void itemDropped (const SourceDetails&) override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     friend class TreeViewItem;
@@ -933,7 +935,6 @@ private:
     class TreeAccessibilityHandler;
     struct InsertPoint;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void itemsChanged() noexcept;
     void updateVisibleItems (std::optional<Point<int>> viewportPosition = {});
     void updateButtonUnderMouse (const MouseEvent&);

modules/juce_gui_basics/windows/juce_AlertWindow.h

@@ -481,6 +481,9 @@ public:
     static constexpr auto WarningIcon  = MessageBoxIconType::WarningIcon;
     static constexpr auto InfoIcon     = MessageBoxIconType::InfoIcon;
 
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
 protected:
     //==============================================================================
     /** @internal */
@@ -521,7 +524,6 @@ private:
     bool escapeKeyCancels = true;
     float desktopScale = 1.0f;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void exitAlert (Button* button);
     void updateLayout (bool onlyIncreaseSize);
 

modules/juce_gui_basics/windows/juce_CallOutBox.h

@@ -164,6 +164,8 @@ public:
     int getBorderSize() const noexcept;
     /** @internal */
     void lookAndFeelChanged() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -177,7 +179,6 @@ private:
 
     Time creationTime;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void refreshPath();
     void timerCallback() override;
 

modules/juce_gui_basics/windows/juce_DialogWindow.h

@@ -255,6 +255,9 @@ public:
     */
     virtual bool escapeKeyPressed();
 
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
+
 protected:
     //==============================================================================
     /** @internal */
@@ -265,8 +268,6 @@ protected:
     float getDesktopScaleFactor() const override { return desktopScale * Desktop::getInstance().getGlobalScaleFactor(); }
 
 private:
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
-
     float desktopScale = 1.0f;
     bool escapeKeyTriggersCloseButton;
 

modules/juce_gui_basics/windows/juce_TooltipWindow.h

@@ -132,6 +132,8 @@ public:
     //==============================================================================
     /** @internal */
     float getDesktopScaleFactor() const override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -145,7 +147,6 @@ private:
     enum ShownManually { yes, no };
     void displayTipInternal (Point<int>, const String&, ShownManually);
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void paint (Graphics&) override;
     void mouseEnter (const MouseEvent&) override;
     void mouseDown (const MouseEvent&) override;

modules/juce_gui_basics/windows/juce_TopLevelWindow.h

@@ -130,6 +130,8 @@ public:
     //==============================================================================
     /** @internal */
     void addToDesktop (int windowStyleFlags, void* nativeWindowToAttachTo = nullptr) override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 protected:
     //==============================================================================
@@ -157,7 +159,6 @@ private:
     bool useDropShadow = true, useNativeTitleBar = false, isCurrentlyActive = false;
     std::unique_ptr<DropShadower> shadower;
 
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void setWindowActive (bool);
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TopLevelWindow)

modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h

@@ -400,6 +400,8 @@ public:
     bool perform (const InvocationInfo&) override;
     /** @internal */
     void lookAndFeelChanged() override;
+    /** @internal */
+    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
 private:
     //==============================================================================
@@ -454,7 +456,6 @@ private:
     int getGutterSize() const noexcept;
 
     //==============================================================================
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
     void insertText (const String&);
     virtual void updateCaretPosition();
     void updateScrollBars();