From 9f80da60c300dcfef1888cef19dd5b7ec1e0c365 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 24 Aug 2019 17:12:59 +0100
Subject: [PATCH] Add buttons to MSW tab order.

Fixes: lp:1840991
* https://bugs.launchpad.net/kicad/+bug/1840991
---
 eeschema/dialogs/dialog_lib_edit_pin.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp
index 4f2c3ba71e..f931c6190d 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2016 - 2018 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2016 - 2019 KiCad Developers, see CHANGELOG.TXT for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,14 +23,12 @@
  */
 
 #include <fctsys.h>
-#include <macros.h>
 #include <gr_basic.h>
 #include <bitmaps.h>
 #include <sch_painter.h>
 #include <lib_edit_frame.h>
 #include <class_libentry.h>
 #include <lib_pin.h>
-
 #include <dialog_lib_edit_pin.h>
 #include <confirm.h>
 #include <widgets/tab_traversal.h>
@@ -62,6 +60,8 @@ DIALOG_LIB_EDIT_PIN::DIALOG_LIB_EDIT_PIN( LIB_EDIT_FRAME* parent, LIB_PIN* aPin
     for ( unsigned ii = 0; ii < orientationNames.GetCount(); ii++ )
         m_choiceOrientation->Insert( orientationNames[ii], KiBitmap( orientationBitmaps[ii] ), ii );
 
+    // We can't set the tab order through wxWidgets due to shortcomings in their mnemonics
+    // implementation on MSW
     m_tabOrder =  {
         m_textPinName,
         m_textPinNumber,
@@ -75,7 +75,9 @@ DIALOG_LIB_EDIT_PIN::DIALOG_LIB_EDIT_PIN( LIB_EDIT_FRAME* parent, LIB_PIN* aPin
         m_numberSizeCtrl,
         m_checkApplyToAllParts,
       	m_checkApplyToAllConversions,
-      	m_checkShow
+      	m_checkShow,
+      	m_sdbSizerButtonsCancel,
+      	m_sdbSizerButtonsOK
     };
 
     m_sdbSizerButtonsOK->SetDefault();
@@ -84,9 +86,8 @@ DIALOG_LIB_EDIT_PIN::DIALOG_LIB_EDIT_PIN( LIB_EDIT_FRAME* parent, LIB_PIN* aPin
     // Now all widgets have the size fixed, call FinishDialogSettings
     FinishDialogSettings();
 
-    // On some windows manager (Unity, XFCE), this dialog is
-    // not always raised, depending on this dialog is run.
-    // Force it to be raised
+    // On some window managers (Unity, XFCE) the dialog is not always raised, depending on
+    // how it is is run.
     Raise();
 }