diff --git a/etgtools/extractors.py b/etgtools/extractors.py
index 50da2e8609..047d159d2b 100644
--- a/etgtools/extractors.py
+++ b/etgtools/extractors.py
@@ -23,6 +23,11 @@
                            textfile_open
 from sphinxtools.utilities import findDescendants
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
 #---------------------------------------------------------------------------
 # These classes simply hold various bits of information about the classes,
 # methods, functions and other items in the C/C++ API being wrapped.
@@ -98,7 +103,7 @@ def clearDeprecated(self):
                     return
 
 
-    def ignore(self, val=True):
+    def ignore(self, val=True) -> Self:
         self.ignored = val
         return self
 
@@ -426,7 +431,7 @@ def renameOverload(self, matchText, newName, **kw):
         return item
 
 
-    def ignore(self, val=True):
+    def ignore(self, val=True) -> Self:
         # In addition to ignoring this item, reorder any overloads to ensure
         # the primary overload is not ignored, if possible.
         super(FunctionDef, self).ignore(val)
diff --git a/wx/lib/agw/aui/aui_switcherdialog.py b/wx/lib/agw/aui/aui_switcherdialog.py
index 72604273b5..00dd5f5729 100644
--- a/wx/lib/agw/aui/aui_switcherdialog.py
+++ b/wx/lib/agw/aui/aui_switcherdialog.py
@@ -158,12 +158,17 @@ def OnSwitchPane(self, event):
 
 """
 
+import sys
 import wx
 
 from . import auibook
 from .aui_utilities import FindFocusDescendant
 from .aui_constants import SWITCHER_TEXT_MARGIN_X, SWITCHER_TEXT_MARGIN_Y
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 # Define a translation function
 _ = wx.GetTranslation
@@ -213,7 +218,7 @@ def Copy(self, item):
         self._window = item._window
 
 
-    def SetTitle(self, title):
+    def SetTitle(self, title) -> Self:
 
         self._title = title
         return self
@@ -224,7 +229,7 @@ def GetTitle(self):
         return self._title
 
 
-    def SetName(self, name):
+    def SetName(self, name) -> Self:
 
         self._name = name
         return self
@@ -235,7 +240,7 @@ def GetName(self):
         return self._name
 
 
-    def SetDescription(self, descr):
+    def SetDescription(self, descr) -> Self:
 
         self._description = descr
         return self
@@ -246,7 +251,7 @@ def GetDescription(self):
         return self._description
 
 
-    def SetId(self, id):
+    def SetId(self, id) -> Self:
 
         self._id = id
         return self
@@ -257,7 +262,7 @@ def GetId(self):
         return self._id
 
 
-    def SetIsGroup(self, isGroup):
+    def SetIsGroup(self, isGroup) -> Self:
 
         self._isGroup = isGroup
         return self
@@ -268,7 +273,7 @@ def GetIsGroup(self):
         return self._isGroup
 
 
-    def BreakColumn(self, breakCol=True):
+    def BreakColumn(self, breakCol=True) -> Self:
 
         self._breakColumn = breakCol
         return self
@@ -279,7 +284,7 @@ def GetBreakColumn(self):
         return self._breakColumn
 
 
-    def SetRect(self, rect):
+    def SetRect(self, rect) -> Self:
 
         self._rect = rect
         return self
@@ -290,7 +295,7 @@ def GetRect(self):
         return self._rect
 
 
-    def SetTextColour(self, colour):
+    def SetTextColour(self, colour) -> Self:
 
         self._textColour = colour
         return self
@@ -301,7 +306,7 @@ def GetTextColour(self):
         return self._textColour
 
 
-    def SetFont(self, font):
+    def SetFont(self, font) -> Self:
 
         self._font = font
         return self
@@ -312,7 +317,7 @@ def GetFont(self):
         return self._font
 
 
-    def SetBitmap(self, bitmap):
+    def SetBitmap(self, bitmap) -> Self:
 
         self._bitmap = bitmap
         return self
@@ -323,7 +328,7 @@ def GetBitmap(self):
         return self._bitmap
 
 
-    def SetRowPos(self, pos):
+    def SetRowPos(self, pos) -> Self:
 
         self._rowPos = pos
         return self
@@ -334,7 +339,7 @@ def GetRowPos(self):
         return self._rowPos
 
 
-    def SetColPos(self, pos):
+    def SetColPos(self, pos) -> Self:
 
         self._colPos = pos
         return self
@@ -345,7 +350,7 @@ def GetColPos(self):
         return self._colPos
 
 
-    def SetWindow(self, win):
+    def SetWindow(self, win) -> Self:
 
         self._window = win
         return self
diff --git a/wx/lib/agw/aui/framemanager.py b/wx/lib/agw/aui/framemanager.py
index 71880c46e0..10cc6bb56f 100644
--- a/wx/lib/agw/aui/framemanager.py
+++ b/wx/lib/agw/aui/framemanager.py
@@ -95,6 +95,7 @@
 __author__ = "Andrea Gavana <andrea.gavana@gmail.com>"
 __date__ = "31 March 2009"
 
+import sys
 import wx
 # just for isinstance
 from time import time
@@ -118,6 +119,11 @@
 
 from .aui_constants import *
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
 # Define this as a translation function
 _ = wx.GetTranslation
 
@@ -254,7 +260,7 @@ def Assign(self, other):
         self.host = other.host
         self.dock_direction = other.dock_direction
 
-    def Host(self, h):
+    def Host(self, h) -> Self:
         """
         Hosts a docking guide window.
 
@@ -264,37 +270,37 @@ def Host(self, h):
         self.host = h
         return self
 
-    def Left(self):
+    def Left(self) -> Self:
         """ Sets the guide window to left docking. """
 
         self.dock_direction = AUI_DOCK_LEFT
         return self
 
-    def Right(self):
+    def Right(self) -> Self:
         """ Sets the guide window to right docking. """
 
         self.dock_direction = AUI_DOCK_RIGHT
         return self
 
-    def Top(self):
+    def Top(self) -> Self:
         """ Sets the guide window to top docking. """
 
         self.dock_direction = AUI_DOCK_TOP
         return self
 
-    def Bottom(self):
+    def Bottom(self) -> Self:
         """ Sets the guide window to bottom docking. """
 
         self.dock_direction = AUI_DOCK_BOTTOM
         return self
 
-    def Center(self):
+    def Center(self) -> Self:
         """ Sets the guide window to center docking. """
 
         self.dock_direction = AUI_DOCK_CENTER
         return self
 
-    def Centre(self):
+    def Centre(self) -> Self:
         """ Sets the guide window to centre docking. """
 
         self.dock_direction = AUI_DOCK_CENTRE
@@ -809,7 +815,7 @@ def HasGripperTop(self):
 
         return self.HasFlag(self.optionGripperTop)
 
-    def Window(self, w):
+    def Window(self, w) -> Self:
         """
         Associate a :class:`wx.Window` derived window to this pane.
 
@@ -823,7 +829,7 @@ def Window(self, w):
         self.window = w
         return self
 
-    def Name(self, name):
+    def Name(self, name) -> Self:
         """
         Sets the name of the pane so it can be referenced in lookup functions.
 
@@ -842,7 +848,7 @@ def Name(self, name):
         self.name = name
         return self
 
-    def Caption(self, caption):
+    def Caption(self, caption) -> Self:
         """
         Sets the caption of the pane.
 
@@ -852,7 +858,7 @@ def Caption(self, caption):
         self.caption = caption
         return self
 
-    def Left(self):
+    def Left(self) -> Self:
         """
         Sets the pane dock position to the left side of the frame.
 
@@ -863,7 +869,7 @@ def Left(self):
         self.dock_direction = AUI_DOCK_LEFT
         return self
 
-    def Right(self):
+    def Right(self) -> Self:
         """
         Sets the pane dock position to the right side of the frame.
 
@@ -874,7 +880,7 @@ def Right(self):
         self.dock_direction = AUI_DOCK_RIGHT
         return self
 
-    def Top(self):
+    def Top(self) -> Self:
         """
         Sets the pane dock position to the top of the frame.
 
@@ -885,7 +891,7 @@ def Top(self):
         self.dock_direction = AUI_DOCK_TOP
         return self
 
-    def Bottom(self):
+    def Bottom(self) -> Self:
         """
         Sets the pane dock position to the bottom of the frame.
 
@@ -896,7 +902,7 @@ def Bottom(self):
         self.dock_direction = AUI_DOCK_BOTTOM
         return self
 
-    def Center(self):
+    def Center(self) -> Self:
         """
         Sets the pane to the center position of the frame.
 
@@ -910,7 +916,7 @@ def Center(self):
         self.dock_direction = AUI_DOCK_CENTER
         return self
 
-    def Centre(self):
+    def Centre(self) -> Self:
         """
         Sets the pane to the center position of the frame.
 
@@ -924,7 +930,7 @@ def Centre(self):
         self.dock_direction = AUI_DOCK_CENTRE
         return self
 
-    def Direction(self, direction):
+    def Direction(self, direction) -> Self:
         """
         Determines the direction of the docked pane. It is functionally the
         same as calling :meth:`Left`, :meth:`Right`, :meth:`Top` or :meth:`Bottom`,
@@ -938,7 +944,7 @@ def Direction(self, direction):
         self.dock_direction = direction
         return self
 
-    def Layer(self, layer):
+    def Layer(self, layer) -> Self:
         """
         Determines the layer of the docked pane.
 
@@ -952,7 +958,7 @@ def Layer(self, layer):
         self.dock_layer = layer
         return self
 
-    def Row(self, row):
+    def Row(self, row) -> Self:
         """
         Determines the row of the docked pane.
 
@@ -962,7 +968,7 @@ def Row(self, row):
         self.dock_row = row
         return self
 
-    def Position(self, pos):
+    def Position(self, pos) -> Self:
         """
         Determines the position of the docked pane.
 
@@ -972,7 +978,7 @@ def Position(self, pos):
         self.dock_pos = pos
         return self
 
-    def MinSize(self, arg1=None, arg2=None):
+    def MinSize(self, arg1=None, arg2=None) -> Self:
         """
         Sets the minimum size of the pane.
 
@@ -994,7 +1000,7 @@ def MinSize(self, arg1=None, arg2=None):
 
         return ret
 
-    def MinSize1(self, size):
+    def MinSize1(self, size) -> Self:
         """
         Sets the minimum size of the pane.
 
@@ -1003,7 +1009,7 @@ def MinSize1(self, size):
         self.min_size = size
         return self
 
-    def MinSize2(self, x, y):
+    def MinSize2(self, x, y) -> Self:
         """
         Sets the minimum size of the pane.
 
@@ -1013,7 +1019,7 @@ def MinSize2(self, x, y):
         self.min_size = wx.Size(x, y)
         return self
 
-    def MaxSize(self, arg1=None, arg2=None):
+    def MaxSize(self, arg1=None, arg2=None) -> Self:
         """
         Sets the maximum size of the pane.
 
@@ -1035,7 +1041,7 @@ def MaxSize(self, arg1=None, arg2=None):
 
         return ret
 
-    def MaxSize1(self, size):
+    def MaxSize1(self, size) -> Self:
         """
         Sets the maximum size of the pane.
 
@@ -1045,7 +1051,7 @@ def MaxSize1(self, size):
         self.max_size = size
         return self
 
-    def MaxSize2(self, x, y):
+    def MaxSize2(self, x, y) -> Self:
         """
         Sets the maximum size of the pane.
 
@@ -1055,7 +1061,7 @@ def MaxSize2(self, x, y):
         self.max_size.Set(x, y)
         return self
 
-    def BestSize(self, arg1=None, arg2=None):
+    def BestSize(self, arg1=None, arg2=None) -> Self:
         """
         Sets the ideal size for the pane. The docking manager will attempt to use
         this size as much as possible when docking or floating the pane.
@@ -1078,7 +1084,7 @@ def BestSize(self, arg1=None, arg2=None):
 
         return ret
 
-    def BestSize1(self, size):
+    def BestSize1(self, size) -> Self:
         """
         Sets the best size of the pane.
 
@@ -1088,7 +1094,7 @@ def BestSize1(self, size):
         self.best_size = size
         return self
 
-    def BestSize2(self, x, y):
+    def BestSize2(self, x, y) -> Self:
         """
         Sets the best size of the pane.
 
@@ -1098,7 +1104,7 @@ def BestSize2(self, x, y):
         self.best_size.Set(x, y)
         return self
 
-    def FloatingPosition(self, pos):
+    def FloatingPosition(self, pos) -> Self:
         """
         Sets the position of the floating pane.
 
@@ -1108,7 +1114,7 @@ def FloatingPosition(self, pos):
         self.floating_pos = wx.Point(*pos)
         return self
 
-    def FloatingSize(self, size):
+    def FloatingSize(self, size) -> Self:
         """
         Sets the size of the floating pane.
 
@@ -1118,12 +1124,12 @@ def FloatingSize(self, size):
         self.floating_size = wx.Size(*size)
         return self
 
-    def Maximize(self):
+    def Maximize(self) -> Self:
         """ Makes the pane take up the full area."""
 
         return self.SetFlag(self.optionMaximized, True)
 
-    def Minimize(self):
+    def Minimize(self) -> Self:
         """
         Makes the pane minimized in a :class:`~wx.lib.agw.aui.auibar.AuiToolBar`.
 
@@ -1138,7 +1144,7 @@ def Minimize(self):
 
         return self.SetFlag(self.optionMinimized, True)
 
-    def MinimizeMode(self, mode):
+    def MinimizeMode(self, mode) -> Self:
         """
         Sets the expected minimized mode if the minimize button is visible.
 
@@ -1177,7 +1183,7 @@ def MinimizeMode(self, mode):
         self.minimize_mode = mode
         return self
 
-    def MinimizeTarget(self, toolbarPane):
+    def MinimizeTarget(self, toolbarPane) -> Self:
         """
         Minimizes the panes using a :class:`AuiPaneInfo` as a target. As :class:`AuiPaneInfo` properties
         need to be copied back and forth every time the perspective has changed, we
@@ -1197,12 +1203,12 @@ def MinimizeTarget(self, toolbarPane):
         self.minimize_target = toolbarPane.name
         return self
 
-    def Restore(self):
+    def Restore(self) -> Self:
         """ Is the reverse of :meth:`Maximize` and :meth:`Minimize`."""
 
         return self.SetFlag(self.optionMaximized | self.optionMinimized, False)
 
-    def Fixed(self):
+    def Fixed(self) -> Self:
         """
         Forces a pane to be fixed size so that it cannot be resized.
         After calling :meth:`Fixed`, :meth:`IsFixed` will return ``True``.
@@ -1210,7 +1216,7 @@ def Fixed(self):
 
         return self.SetFlag(self.optionResizable, False)
 
-    def Resizable(self, resizable=True):
+    def Resizable(self, resizable=True) -> Self:
         """
         Allows a pane to be resizable if `resizable` is ``True``, and forces
         it to be a fixed size if `resizeable` is ``False``.
@@ -1235,7 +1241,7 @@ def Transparent(self, alpha):
         self.transparent = alpha
         self.needsTransparency = True
 
-    def Dock(self):
+    def Dock(self) -> Self:
         """ Indicates that a pane should be docked. It is the opposite of :meth:`Float`. """
 
         if self.IsNotebookPage():
@@ -1244,7 +1250,7 @@ def Dock(self):
 
         return self.SetFlag(self.optionFloating, False)
 
-    def Float(self):
+    def Float(self) -> Self:
         """ Indicates that a pane should be floated. It is the opposite of :meth:`Dock`. """
 
         if self.IsNotebookPage():
@@ -1253,7 +1259,7 @@ def Float(self):
 
         return self.SetFlag(self.optionFloating, True)
 
-    def Hide(self):
+    def Hide(self) -> Self:
         """
         Indicates that a pane should be hidden.
 
@@ -1262,7 +1268,7 @@ def Hide(self):
 
         return self.SetFlag(self.optionHidden, True)
 
-    def Show(self, show=True):
+    def Show(self, show=True) -> Self:
         """
         Indicates that a pane should be shown.
 
@@ -1272,7 +1278,7 @@ def Show(self, show=True):
         return self.SetFlag(self.optionHidden, not show)
 
     # By defaulting to 1000, the tab will get placed at the end
-    def NotebookPage(self, id, tab_position=1000):
+    def NotebookPage(self, id, tab_position=1000) -> Self:
         """
         Forces a pane to be a notebook page, so that the pane can be
         docked on top to another to create a :class:`~wx.lib.agw.aui.auibook.AuiNotebook`.
@@ -1291,7 +1297,7 @@ def NotebookPage(self, id, tab_position=1000):
 
         return self
 
-    def NotebookControl(self, id):
+    def NotebookControl(self, id) -> Self:
         """
         Forces a pane to be a notebook control (:class:`~wx.lib.agw.aui.auibook.AuiNotebook`).
 
@@ -1322,7 +1328,7 @@ def IsNotebookControl(self):
 
         return not self.IsNotebookPage() and self.HasNotebook()
 
-    def SetNameFromNotebookId(self):
+    def SetNameFromNotebookId(self) -> Self:
         """ Sets the pane name once docked in a :class:`~wx.lib.agw.aui.auibook.AuiNotebook` using the notebook id. """
 
         if self.notebook_id >= 0:
@@ -1330,7 +1336,7 @@ def SetNameFromNotebookId(self):
 
         return self
 
-    def CaptionVisible(self, visible=True, left=False):
+    def CaptionVisible(self, visible=True, left=False) -> Self:
         """
         Indicates that a pane caption should be visible. If `visible` is ``False``, no pane
         caption is drawn.
@@ -1346,7 +1352,7 @@ def CaptionVisible(self, visible=True, left=False):
         self.SetFlag(self.optionCaptionLeft, False)
         return self.SetFlag(self.optionCaption, visible)
 
-    def PaneBorder(self, visible=True):
+    def PaneBorder(self, visible=True) -> Self:
         """
         Indicates that a border should be drawn for the pane.
 
@@ -1355,7 +1361,7 @@ def PaneBorder(self, visible=True):
 
         return self.SetFlag(self.optionPaneBorder, visible)
 
-    def Gripper(self, visible=True):
+    def Gripper(self, visible=True) -> Self:
         """
         Indicates that a gripper should be drawn for the pane.
 
@@ -1364,7 +1370,7 @@ def Gripper(self, visible=True):
 
         return self.SetFlag(self.optionGripper, visible)
 
-    def GripperTop(self, attop=True):
+    def GripperTop(self, attop=True) -> Self:
         """
         Indicates that a gripper should be drawn at the top of the pane.
 
@@ -1373,7 +1379,7 @@ def GripperTop(self, attop=True):
 
         return self.SetFlag(self.optionGripperTop, attop)
 
-    def CloseButton(self, visible=True):
+    def CloseButton(self, visible=True) -> Self:
         """
         Indicates that a close button should be drawn for the pane.
 
@@ -1382,7 +1388,7 @@ def CloseButton(self, visible=True):
 
         return self.SetFlag(self.buttonClose, visible)
 
-    def MaximizeButton(self, visible=True):
+    def MaximizeButton(self, visible=True) -> Self:
         """
         Indicates that a maximize button should be drawn for the pane.
 
@@ -1391,7 +1397,7 @@ def MaximizeButton(self, visible=True):
 
         return self.SetFlag(self.buttonMaximize, visible)
 
-    def MinimizeButton(self, visible=True):
+    def MinimizeButton(self, visible=True) -> Self:
         """
         Indicates that a minimize button should be drawn for the pane.
 
@@ -1400,7 +1406,7 @@ def MinimizeButton(self, visible=True):
 
         return self.SetFlag(self.buttonMinimize, visible)
 
-    def PinButton(self, visible=True):
+    def PinButton(self, visible=True) -> Self:
         """
         Indicates that a pin button should be drawn for the pane.
 
@@ -1409,7 +1415,7 @@ def PinButton(self, visible=True):
 
         return self.SetFlag(self.buttonPin, visible)
 
-    def DestroyOnClose(self, b=True):
+    def DestroyOnClose(self, b=True) -> Self:
         """
         Indicates whether a pane should be destroyed when it is closed.
 
@@ -1422,7 +1428,7 @@ def DestroyOnClose(self, b=True):
 
         return self.SetFlag(self.optionDestroyOnClose, b)
 
-    def TopDockable(self, b=True):
+    def TopDockable(self, b=True) -> Self:
         """
         Indicates whether a pane can be docked at the top of the frame.
 
@@ -1431,7 +1437,7 @@ def TopDockable(self, b=True):
 
         return self.SetFlag(self.optionTopDockable, b)
 
-    def BottomDockable(self, b=True):
+    def BottomDockable(self, b=True) -> Self:
         """
         Indicates whether a pane can be docked at the bottom of the frame.
 
@@ -1449,7 +1455,7 @@ def LeftDockable(self, b=True):
 
         return self.SetFlag(self.optionLeftDockable, b)
 
-    def RightDockable(self, b=True):
+    def RightDockable(self, b=True) -> Self:
         """
         Indicates whether a pane can be docked on the right of the frame.
 
@@ -1458,7 +1464,7 @@ def RightDockable(self, b=True):
 
         return self.SetFlag(self.optionRightDockable, b)
 
-    def Floatable(self, b=True):
+    def Floatable(self, b=True) -> Self:
         """
         Sets whether the user will be able to undock a pane and turn it
         into a floating window.
@@ -1468,7 +1474,7 @@ def Floatable(self, b=True):
 
         return self.SetFlag(self.optionFloatable, b)
 
-    def Movable(self, b=True):
+    def Movable(self, b=True) -> Self:
         """
         Indicates whether a pane can be moved.
 
@@ -1477,7 +1483,7 @@ def Movable(self, b=True):
 
         return self.SetFlag(self.optionMovable, b)
 
-    def NotebookDockable(self, b=True):
+    def NotebookDockable(self, b=True) -> Self:
         """
         Indicates whether a pane can be docked in an automatic :class:`~wx.lib.agw.aui.auibook.AuiNotebook`.
 
@@ -1486,7 +1492,7 @@ def NotebookDockable(self, b=True):
 
         return self.SetFlag(self.optionNotebookDockable, b)
 
-    def DockFixed(self, b=True):
+    def DockFixed(self, b=True) -> Self:
         """
         Causes the containing dock to have no resize sash. This is useful
         for creating panes that span the entire width or height of a dock, but should
@@ -1516,7 +1522,7 @@ def TopSnappable(self, b=True):
 
         return self.SetFlag(self.optionTopSnapped, b)
 
-    def BottomSnappable(self, b=True):
+    def BottomSnappable(self, b=True) -> Self:
         """
         Indicates whether a pane can be snapped at the bottom of the main frame.
 
@@ -1525,7 +1531,7 @@ def BottomSnappable(self, b=True):
 
         return self.SetFlag(self.optionBottomSnapped, b)
 
-    def LeftSnappable(self, b=True):
+    def LeftSnappable(self, b=True) -> Self:
         """
         Indicates whether a pane can be snapped on the left of the main frame.
 
@@ -1543,7 +1549,7 @@ def RightSnappable(self, b=True):
 
         return self.SetFlag(self.optionRightSnapped, b)
 
-    def Snappable(self, b=True):
+    def Snappable(self, b=True) -> Self:
         """
         Indicates whether a pane can be snapped on the main frame. This is
         equivalent as calling :meth:`TopSnappable` . :meth:`BottomSnappable` . :meth:`LeftSnappable` . :meth:`RightSnappable` .
@@ -1553,7 +1559,7 @@ def Snappable(self, b=True):
 
         return self.TopSnappable(b).BottomSnappable(b).LeftSnappable(b).RightSnappable(b)
 
-    def FlyOut(self, b=True):
+    def FlyOut(self, b=True) -> Self:
         """
         Indicates whether a pane, when floating, has a "fly-out" effect
         (i.e., floating panes which only show themselves when moused over).
@@ -1564,7 +1570,7 @@ def FlyOut(self, b=True):
         return self.SetFlag(self.optionFlyOut, b)
 
     # Copy over the members that pertain to docking position
-    def SetDockPos(self, source):
+    def SetDockPos(self, source) -> Self:
         """
         Copies the `source` pane members that pertain to docking position to `self`.
 
@@ -1583,7 +1589,7 @@ def SetDockPos(self, source):
 
         return self
 
-    def DefaultPane(self):
+    def DefaultPane(self) -> Self:
         """ Specifies that the pane should adopt the default pane settings. """
 
         state = self.state
@@ -1596,7 +1602,7 @@ def DefaultPane(self):
         self.state = state
         return self
 
-    def CentrePane(self):
+    def CentrePane(self) -> Self:
         """
         Specifies that the pane should adopt the default center pane settings.
 
@@ -1606,7 +1612,7 @@ def CentrePane(self):
 
         return self.CenterPane()
 
-    def CenterPane(self):
+    def CenterPane(self) -> Self:
         """
         Specifies that the pane should adopt the default center pane settings.
 
@@ -1617,7 +1623,7 @@ def CenterPane(self):
         self.state = 0
         return self.Center().PaneBorder().Resizable()
 
-    def ToolbarPane(self):
+    def ToolbarPane(self) -> Self:
         """ Specifies that the pane should adopt the default toolbar pane settings. """
 
         self.DefaultPane()
@@ -1633,7 +1639,7 @@ def ToolbarPane(self):
 
         return self
 
-    def Icon(self, icon):
+    def Icon(self, icon) -> Self:
         """
         Specifies whether an icon is drawn on the left of the caption text when
         the pane is docked. If `icon` is ``None`` or :class:`NullIcon`, no icon is drawn on
@@ -1649,7 +1655,7 @@ def Icon(self, icon):
         self.icon = icon
         return self
 
-    def SetFlag(self, flag, option_state):
+    def SetFlag(self, flag, option_state) -> Self:
         """
         Turns the property given by `flag` on or off with the `option_state`
         parameter.
diff --git a/wx/lib/agw/hypertreelist.py b/wx/lib/agw/hypertreelist.py
index 60ec7435ab..19c9be6f55 100644
--- a/wx/lib/agw/hypertreelist.py
+++ b/wx/lib/agw/hypertreelist.py
@@ -294,7 +294,7 @@ def __init__(self):
 Version 1.4
 
 """
-
+import sys
 import wx
 
 from wx.lib.agw.customtreectrl import CustomTreeCtrl
@@ -305,6 +305,11 @@ def __init__(self):
 # Python 2/3 compatibility helper
 import six
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
 # Version Info
 __version__ = "1.4"
 
@@ -488,7 +493,7 @@ def GetText(self):
         return self._text
 
 
-    def SetText(self, text):
+    def SetText(self, text) -> Self:
         """
         Sets the column header label.
 
@@ -505,7 +510,7 @@ def GetWidth(self):
         return self._width
 
 
-    def SetWidth(self, width):
+    def SetWidth(self, width) -> Self:
         """
         Sets the column header width.
 
@@ -522,7 +527,7 @@ def GetAlignment(self):
         return self._flag
 
 
-    def SetAlignment(self, flag):
+    def SetAlignment(self, flag) -> Self:
         """
         Sets the column text alignment.
 
@@ -540,7 +545,7 @@ def GetColour(self):
         return self._colour
 
 
-    def SetColour(self, colour):
+    def SetColour(self, colour) -> Self:
         """
         Sets the column text colour.
 
@@ -557,7 +562,7 @@ def GetImage(self):
         return self._image
 
 
-    def SetImage(self, image):
+    def SetImage(self, image) -> Self:
         """
         Sets the column image index.
 
@@ -575,7 +580,7 @@ def GetSelectedImage(self):
         return self._selected_image
 
 
-    def SetSelectedImage(self, image):
+    def SetSelectedImage(self, image) -> Self:
         """
         Sets the column image index in the selected state.
 
@@ -594,7 +599,7 @@ def IsEditable(self):
         return self._edit
 
 
-    def SetEditable(self, edit):
+    def SetEditable(self, edit) -> Self:
         """
         Sets the column as editable or non-editable.
 
@@ -611,7 +616,7 @@ def IsShown(self):
         return self._shown
 
 
-    def SetShown(self, shown):
+    def SetShown(self, shown) -> Self:
         """
         Sets the column as shown or hidden.
 
@@ -623,7 +628,7 @@ def SetShown(self, shown):
         return self
 
 
-    def SetFont(self, font):
+    def SetFont(self, font) -> Self:
         """
         Sets the column text font.
 
@@ -646,7 +651,7 @@ def GetSortIcon(self):
         return self._sort_icon
 
 
-    def SetSortIcon(self, sortIcon, colour=None):
+    def SetSortIcon(self, sortIcon, colour=None) -> Self:
         """
         Sets the column sort icon displayed in the header.
 
diff --git a/wx/lib/agw/ribbon/art_internal.py b/wx/lib/agw/ribbon/art_internal.py
index 78e8f3fe42..a49a356c12 100644
--- a/wx/lib/agw/ribbon/art_internal.py
+++ b/wx/lib/agw/ribbon/art_internal.py
@@ -14,10 +14,15 @@
 """
 This module contains methods used throughout the :class:`bar` library.
 """
-
+import sys
 import wx
 import math
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
 
 def RibbonInterpolateColour(start_colour, end_colour, position, start_position, end_position):
 
@@ -200,7 +205,7 @@ def Darker(self, delta):
         return self.Lighter(-delta)
 
 
-    def MakeDarker(self, delta):
+    def MakeDarker(self, delta) -> Self:
 
         self.luminance -= delta
         return self
diff --git a/wx/lib/graphics.py b/wx/lib/graphics.py
index f57f016f13..c02783fdd2 100644
--- a/wx/lib/graphics.py
+++ b/wx/lib/graphics.py
@@ -37,6 +37,7 @@
    is maintained.
 """
 
+import sys
 import math
 import six
 
@@ -44,7 +45,10 @@
 import wx.lib.wxcairo as wxcairo
 import cairo
 
-
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 # Other ideas:
 # 1. TextToPath (or maybe make this part of the Path class
@@ -760,13 +764,13 @@ def GetNativeMatrix(self):
         return self._matrix
 
 
-    def Concat(self, matrix):
+    def Concat(self, matrix) -> Self:
         """Concatenates the matrix passed with the current matrix."""
         self._matrix = self._matrix * matrix._matrix
         return self
 
 
-    def Invert(self):
+    def Invert(self) -> Self:
         """Inverts the matrix."""
         self._matrix.invert()
         return self
@@ -782,19 +786,19 @@ def IsIdentity(self):
         return self._matrix == cairo.Matrix()
 
 
-    def Rotate(self, angle):
+    def Rotate(self, angle) -> Self:
         """Rotates the matrix in radians"""
         self._matrix.rotate(angle)
         return self
 
 
-    def Scale(self, xScale, yScale):
+    def Scale(self, xScale, yScale) -> Self:
         """Scale the matrix"""
         self._matrix.scale(xScale, yScale)
         return self
 
 
-    def Translate(self, dx, dy):
+    def Translate(self, dx, dy) -> Self:
         """Translate the matrix.  This shifts the origin."""
         self._matrix.translate(dx, dy)
         return self
@@ -836,7 +840,7 @@ def __init__(self):
         self._pathContext = cairo.Context(surface)
 
 
-    def AddArc(self, x, y, radius, startAngle, endAngle, clockwise=True):
+    def AddArc(self, x, y, radius, startAngle, endAngle, clockwise=True) -> Self:
         """
         Adds an arc of a circle centering at (x,y) with radius, from
         startAngle to endAngle.
@@ -849,7 +853,7 @@ def AddArc(self, x, y, radius, startAngle, endAngle, clockwise=True):
         return self
 
 
-    def AddArcToPoint(self, x1, y1 , x2, y2, radius ):
+    def AddArcToPoint(self, x1, y1 , x2, y2, radius ) -> Self:
         """
         Adds a an arc to two tangents connecting (current) to (x1,y1)
         and (x1,y1) to (x2,y2), also a straight line from (current) to
@@ -888,7 +892,7 @@ def AddArcToPoint(self, x1, y1 , x2, y2, radius ):
         return self
 
 
-    def AddCircle(self, x, y, radius):
+    def AddCircle(self, x, y, radius) -> Self:
         """
         Appends a new closed sub-path as a circle around (x,y).
         """
@@ -898,7 +902,7 @@ def AddCircle(self, x, y, radius):
         return self
 
 
-    def AddCurveToPoint(self, cx1, cy1, cx2, cy2, x, y):
+    def AddCurveToPoint(self, cx1, cy1, cx2, cy2, x, y) -> Self:
         """
         Adds a cubic Bezier curve from the current point, using two
         control points and an end point.
@@ -907,7 +911,7 @@ def AddCurveToPoint(self, cx1, cy1, cx2, cy2, x, y):
         return self
 
 
-    def AddEllipse(self, x, y, w, h):
+    def AddEllipse(self, x, y, w, h) -> Self:
         """
         Appends an ellipse fitting into the given rectangle as a closed sub-path.
         """
@@ -925,7 +929,7 @@ def AddEllipse(self, x, y, w, h):
         return self
 
 
-    def AddLineToPoint(self, x, y):
+    def AddLineToPoint(self, x, y) -> Self:
         """
         Adds a straight line from the current point to (x,y)
         """
@@ -933,7 +937,7 @@ def AddLineToPoint(self, x, y):
         return self
 
 
-    def AddPath(self, path):
+    def AddPath(self, path) -> Self:
         """
         Appends the given path to this path.
         """
@@ -941,7 +945,7 @@ def AddPath(self, path):
         return self
 
 
-    def AddQuadCurveToPoint(self, cx, cy, x, y):
+    def AddQuadCurveToPoint(self, cx, cy, x, y) -> Self:
         """
         Adds a quadratic Bezier curve from the current point, using a
         control point and an end point.
@@ -957,7 +961,7 @@ def AddQuadCurveToPoint(self, cx, cy, x, y):
         return self
 
 
-    def AddRectangle(self, x, y, w, h):
+    def AddRectangle(self, x, y, w, h) -> Self:
         """
         Adds a new rectangle as a closed sub-path.
         """
@@ -965,7 +969,7 @@ def AddRectangle(self, x, y, w, h):
         return self
 
 
-    def AddRoundedRectangle(self, x, y, w, h, radius):
+    def AddRoundedRectangle(self, x, y, w, h, radius) -> Self:
         """
         Adds a new rounded rectangle as a closed sub-path.
         """
@@ -981,7 +985,7 @@ def AddRoundedRectangle(self, x, y, w, h, radius):
         return self
 
 
-    def CloseSubpath(self):
+    def CloseSubpath(self) -> Self:
         """
         Adds a line segment to the path from the current point to the
         beginning of the current sub-path, and closes this sub-path.
@@ -1016,7 +1020,7 @@ def GetNativePath(self):
         return self._pathContext.copy_path()
 
 
-    def MoveToPoint(self, x, y):
+    def MoveToPoint(self, x, y) -> Self:
         """
         Begins a new sub-path at (x,y) by moving the "current point" there.
         """
@@ -1024,7 +1028,7 @@ def MoveToPoint(self, x, y):
         return self
 
 
-    def Transform(self, matrix):
+    def Transform(self, matrix) -> Self:
         """
         Transforms each point in this path by the matrix
         """