Put OK/Cancel last in tab cycle of some WB dialogs

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 581e60b..2a3af69 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -422,8 +422,6 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "General Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,180,178,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,236,178,50,14\r
     CONTROL         "Always on &Top",OPT_AlwaysOnTop,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,4,6,151,10\r
     CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",\r
@@ -472,6 +470,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,151,10\r
     CONTROL         "One-Click Move",OPT_SmartMove,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,160,151,10\r
+    DEFPUSHBUTTON   "OK",IDOK,180,178,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,236,178,50,14\r
 END\r
 \r
 DLG_IcsOptions DIALOGEX 0, 0, 302, 268\r
@@ -571,8 +571,6 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Board Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14\r
     CONTROL         "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | \r
                     WS_GROUP | WS_TABSTOP,9,14,50,10\r
     CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,\r
@@ -646,6 +644,8 @@ BEGIN
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
     EDITTEXT        OPT_SampleDarkSquare,144,138,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
+    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14\r
 END\r
 \r
 DLG_NewVariant DIALOG DISCARDABLE  0, 0, 224, 250\r
@@ -653,8 +653,6 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Variants"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,114,232,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,170,232,50,14\r
     CONTROL         "&normal",OPT_VariantNormal,"Button",BS_AUTORADIOBUTTON | \r
                     WS_GROUP | WS_TABSTOP,9,14,70,10\r
     CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,9,\r
@@ -725,6 +723,8 @@ BEGIN
     EDITTEXT        IDC_Holdings,93,149,14,14,ES_AUTOHSCROLL\r
     LTEXT           "pieces",IDC_Pieces,110,153,22,8\r
     LTEXT           "('-1' means defaults for selected variant)",IDC_Def,10,171,210,8\r
+    DEFPUSHBUTTON   "OK",IDOK,114,232,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,170,232,50,14\r
 END\r
 \r
 DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226\r