Merge.rc: Fix the problem that the static control (filename being compared) in IDD_DI...

diff --git a/Src/Merge.rc b/Src/Merge.rc
index fc5e0d5..956edff 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1246,7 +1246,7 @@ BEGIN
     LTEXT           "Comparing items...",IDC_STATIC,7,7,150,10\r
     LTEXT           "Items compared:",IDC_STATIC,7,29,85,10\r
     LTEXT           "Items total:",IDC_STATIC,7,19,85,10\r
-    LTEXT           "",IDC_PATH_COMPARING,137,29,242,10\r
+    LTEXT           "",IDC_PATH_COMPARING,137,29,111,10\r
 END\r
 \r
 IDD_WMGOTO DIALOGEX 0, 0, 210, 80\r
@@ -1777,6 +1777,7 @@ BEGIN
     PUSHBUTTON      "&Hex View",IDC_HEXVIEW,261,29,120,14\r
 END\r
 \r
+\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // DESIGNINFO\r
@@ -1811,7 +1812,7 @@ BEGIN
     0, 0, 0, 0,\r
     0, 0, 0, 0,\r
     0, 0, 0, 0,\r
-    0, 0, 0, 0\r
+    0, 0, 100, 0\r
 END\r
 \r
 IDD_PROPPAGE_COLORS_MARKER AFX_DIALOG_LAYOUT\r
@@ -2664,13 +2665,13 @@ END
 \r
 STRINGTABLE\r
 BEGIN\r
-    IDS_CREATE_FOLDER        "%1 does not exist. Do you want to create it?"\r
-    IDS_CREATE_FOLDER_ERROR  "Failed to create folder."\r
+    IDS_CREATE_FOLDER       "%1 does not exist. Do you want to create it?"\r
+    IDS_CREATE_FOLDER_ERROR "Failed to create folder."\r
 END\r
 \r
 STRINGTABLE\r
 BEGIN\r
-    IDC_EXT_EDITOR_PATH      "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"\r
+    IDC_EXT_EDITOR_PATH     "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"\r
 END\r
 #endif    // English (United States) resources\r
 /////////////////////////////////////////////////////////////////////////////\r