PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 6e70de0..63038cf 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -9,6 +9,9 @@ Add new items to top.
  PATCH: [ 1452288 ] Add ASP.NET filefilter
   By By Jon Galloway and Josh Blair
   Filters new file: ASPNET.flt
+ PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
+  Src: Merge.rc
+  Src/Languages/*: Merge*.rc
 
 2006-03-19 Kimmo
  PATCH: [ 1449892 ] Add compare method to configlog

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 6d47674..d08da80 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Selecione Arquivos ou Diretórios..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Idiomas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 4ea31af..417f5f9 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Èçáåðè Ôàéë èëè äèðåêòîðèÿ..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Åçèê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 4e1a9be..1308656 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 376, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Tria de fitxers o directoris..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Idioma"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 5aa35e6..fe52a58 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -640,7 +640,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Ñ¡ÔñÎļþ»òÎļþ¼Ð..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -743,8 +744,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "ÓïÑÔ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1445,7 +1446,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 6249214..cd07c81 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "¿ï¨úÀɮשθê®Æ§¨..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "»y¨¥"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 241644b..6e83fb1 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Vybrat soubory nebo slo\9eky..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Jazyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index e4c346d..98a2dcc 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Vælg filer eller mapper..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Sprog"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 2f6d0d0..febb12e 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Bestanden of mappen selecteren"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,9 +742,9 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
-CAPTION "Taalkeuze"
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
+APTION "Taalkeuze"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     PUSHBUTTON      "OK",IDOK,30,123,52,14
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index fe828d0..6fd1093 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -636,8 +636,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU |
-    WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Sélection des fichiers ou des répertoires..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +741,8 @@ END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
-CAPTION "Langage"
+    WS_SYSMENU | WS_THICKFRAME
+APTION "Langage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     PUSHBUTTON      "OK",IDOK,30,123,52,14
@@ -1439,7 +1439,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 6185967..9c9f611 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 368, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Dateien oder Verzeichnisse auswählen..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Sprache"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 6111e25..2892e07 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Válaszd ki a fájlokat vagy könyvtárakat..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Nyelv"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 72b6e2f..2907176 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Seleziona i file o le cartelle..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Lingua"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index f69979b..ab86015 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 374, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "\83t\83@\83C\83\8b\82Ü\82½\82Í\83t\83H\83\8b\83_\82Ì\91I\91ð..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "\8c¾\8cê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index e125c72..9c3a434 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "¾ð¾î"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index e548ee1..6c5d900 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Velg filer eller mapper..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Språk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 7ec8239..011ec51 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Wybierz pliki lub katalogi..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Jêzyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 6e1bed5..8b14623 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 370, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Âûáåðèòå ôàéëû èëè êàòàëîãè..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "ßçûê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 1fd1b01..3a40f41 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Výber súborov a adresárov..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Jazyk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index a8b5867..0564e8f 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Seleccione ficheros o directorios..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Idioma"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 7518467..25b915a 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Välj filer eller kataloger..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Språk"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index a912cd3..b6f45b3 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -638,8 +638,9 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
-CAPTION "Select Files or Directories..."
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
+CAPTION "Select Files or Folders"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     RTEXT           "&Left:",IDC_STATIC,13,24,40,8
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Language"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

diff --git a/Src/Merge.rc b/Src/Merge.rc
index f4a2642..73bda9c 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -638,7 +638,8 @@ BEGIN
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Select Files or Folders"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -741,8 +742,8 @@ BEGIN
 END
 
 IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142
-STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Language"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -1443,7 +1444,8 @@ BEGIN
 END
 
 IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+    WS_SYSMENU | WS_THICKFRAME
 CAPTION "Codepage"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN