From 080b0f65cbf468b7e42c0a02eb0196d5ccde999d Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Tue, 31 May 2022 08:03:36 -0700
Subject: [PATCH] Fix wxCommandLinkButton alphabetical position

The alphabetical order for this handler was wrong, affecting not
only it's placement in the main HTML page, but also the list of
handlers on the right side.

This commit is best viewed with git --color-moved option.

Closes #22478.
---
 docs/doxygen/overviews/xrc_format.h | 58 ++++++++++++++---------------
 misc/schema/xrc_schema.rnc          |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 72cd8b63cb..6835acb8e2 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -1036,35 +1036,6 @@ its @c notebookpage).
 Each @c choicebookpage has exactly one non-toplevel window as its child.
 
 
-@subsubsection xrc_wxcommandlinkbutton wxCommandLinkButton
-
-The wxCommandLinkButton contains a main title-like @c label and an optional
-@c note for longer description. The main @c label and the @c note can be
-concatenated into a single string using a new line character between them
-(notice that the @c note part can have more new lines in it).
-
-@beginTable
-@hdr3col{property, type, description}
-@row3col{label, @ref overview_xrcformat_type_text,
-    First line of text on the button, typically the label of an action that
-    will be made when the button is pressed (default: empty). }
-@row3col{note, @ref overview_xrcformat_type_text,
-    Second line of text describing the action performed when the button is pressed (default: none).  }
-@row3col{bitmap, @ref overview_xrcformat_type_bitmap,
-    Bitmap to display in the button (optional). @since 3.1.5}
-@row3col{pressed, @ref overview_xrcformat_type_bitmap,
-     Bitmap to show when the button is pressed (default: none, same as @c bitmap). @since 3.1.7}
-@row3col{focus, @ref overview_xrcformat_type_bitmap,
-     Bitmap to show when the button has focus (default: none, same as @c bitmap). @since 3.1.7}
-@row3col{disabled, @ref overview_xrcformat_type_bitmap,
-     Bitmap to show when the button is disabled (default: none, same as @c bitmap). @since 3.1.7}
-@row3col{current, @ref overview_xrcformat_type_bitmap,
-     Bitmap to show when the mouse cursor hovers above the bitmap (default: none, same as @c bitmap). @since 3.1.7}
-@row3col{default, @ref overview_xrcformat_type_bool,
-    Should this button be the default button in dialog (default: 0)? @since 3.1.5}
-@endTable
-
-
 @subsubsection xrc_wxcollapsiblepane wxCollapsiblePane
 
 @beginTable
@@ -1132,6 +1103,35 @@ Example:
 @endTable
 
 
+@subsubsection xrc_wxcommandlinkbutton wxCommandLinkButton
+
+The wxCommandLinkButton contains a main title-like @c label and an optional
+@c note for longer description. The main @c label and the @c note can be
+concatenated into a single string using a new line character between them
+(notice that the @c note part can have more new lines in it).
+
+@beginTable
+@hdr3col{property, type, description}
+@row3col{label, @ref overview_xrcformat_type_text,
+    First line of text on the button, typically the label of an action that
+    will be made when the button is pressed (default: empty). }
+@row3col{note, @ref overview_xrcformat_type_text,
+    Second line of text describing the action performed when the button is pressed (default: none).  }
+@row3col{bitmap, @ref overview_xrcformat_type_bitmap,
+    Bitmap to display in the button (optional). @since 3.1.5}
+@row3col{pressed, @ref overview_xrcformat_type_bitmap,
+     Bitmap to show when the button is pressed (default: none, same as @c bitmap). @since 3.1.7}
+@row3col{focus, @ref overview_xrcformat_type_bitmap,
+     Bitmap to show when the button has focus (default: none, same as @c bitmap). @since 3.1.7}
+@row3col{disabled, @ref overview_xrcformat_type_bitmap,
+     Bitmap to show when the button is disabled (default: none, same as @c bitmap). @since 3.1.7}
+@row3col{current, @ref overview_xrcformat_type_bitmap,
+     Bitmap to show when the mouse cursor hovers above the bitmap (default: none, same as @c bitmap). @since 3.1.7}
+@row3col{default, @ref overview_xrcformat_type_bool,
+    Should this button be the default button in dialog (default: 0)? @since 3.1.5}
+@endTable
+
+
 @subsubsection xrc_wxdataviewctrl wxDataViewCtrl
 
 No additional properties.
diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index 7c3d4def34..65d6899a7c 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -172,11 +172,11 @@ builtinWindowClasses =
     | wxCheckListBox
     | wxChoice
     | wxChoicebook
-    | wxCommandLinkButton
     | wxCollapsiblePane
     | wxColourPickerCtrl
     | wxComboBox
     | wxComboCtrl
+    | wxCommandLinkButton
     | wxDataViewCtrl
     | wxDataViewListCtrl
     | wxDataViewTreeCtrl