From a8175f49a623c7d8f8ab0d16639a8701e0002b26 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 26 Feb 2022 16:38:41 +0000
Subject: [PATCH] Repair tab order in Footprint Properties dialog.

Fixes https://gitlab.com/kicad/code/kicad/issues/10978

(cherry picked from commit 2c6a2c3479a03ee8010efd1f98a62dedb7fc5694)
---
 .../dialogs/dialog_footprint_properties.cpp   | 19 +++++++++++++++++++
 .../dialog_footprint_properties_base.fbp      |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp
index a64885fd3a..0c04d597c4 100644
--- a/pcbnew/dialogs/dialog_footprint_properties.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties.cpp
@@ -150,6 +150,25 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen
     m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
     m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
 
+    // We can't set the tab order through wxWidgets due to shortcomings in their mnemonics
+    // implementation on MSW
+    m_tabOrder = {
+        m_itemsGrid,
+        m_ModPositionX,
+        m_ModPositionY,
+        m_BoardSideCtrl,
+        m_OrientValueCtrl,
+        m_componentType,
+        m_boardOnly,
+        m_excludeFromPosFiles,
+        m_excludeFromBOM,
+      	m_NetClearanceCtrl,
+        m_SolderMaskMarginCtrl,
+        m_SolderPasteMarginCtrl,
+      	m_PasteMarginRatioCtrl,
+        m_ZoneConnectionChoice
+    };
+
     finishDialogSettings();
     m_initialized = true;
 }
diff --git a/pcbnew/dialogs/dialog_footprint_properties_base.fbp b/pcbnew/dialogs/dialog_footprint_properties_base.fbp
index 50f23cc464..703d209eb0 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_footprint_properties_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="16" />
+    <FileVersion major="1" minor="15" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>