Fix GitHub issue #739: Copy confirmation dialog has overlapped Yes/No Button

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 771093d..bb723f2 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1883,7 +1883,7 @@ BEGIN
 END\r
 \r
 IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 115\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
 CAPTION "Confirm Copy"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
@@ -1893,7 +1893,7 @@ BEGIN
     EDITTEXT        IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL | ES_READONLY\r
     LTEXT           "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,10\r
     EDITTEXT        IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL | ES_READONLY\r
-       CONTROL         "Don't ask this &question again.",IDC_FLDCONFIRM_DONTASKAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,81,232,10\r
+    CONTROL         "Don't ask this &question again.",IDC_FLDCONFIRM_DONTASKAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,81,232,10\r
     DEFPUSHBUTTON   "Yes",IDYES,174,95,50,14\r
     PUSHBUTTON      "No",IDNO,228,95,50,14\r
 END\r
@@ -2292,9 +2292,9 @@ BEGIN
     0, 0, 100, 0,\r
     0, 0, 0, 0,\r
     0, 0, 100, 0,\r
+    0, 0, 0, 0\r
     100, 0, 0, 0,\r
     100, 0, 0, 0,\r
-    0, 0, 0, 0\r
 END\r
 \r
 IDD_DIALOG_WINDOWSMANAGER AFX_DIALOG_LAYOUT\r