Making CPropertySheet resizable needs some re-work. For now resized the Line and...

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 9facf2c..5d1d179 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1157,14 +1157,14 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,240,154,50,14\r
 END\r
 \r
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188\r
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 535, 188\r
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
 CAPTION "Linefilters"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
     CONTROL         "Enable Line Filters",IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,351,15\r
-    LTEXT           "Regular Expressions (one per line):",IDC_STATIC,7,28,351,10\r
-    CONTROL         "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,121\r
+    LTEXT           "Regular Expressions (one per line):",IDC_STATIC,7,24,351,10\r
+    CONTROL         "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,519,121\r
     PUSHBUTTON      "New",IDC_LFILTER_ADDBTN,7,167,50,14\r
     PUSHBUTTON      "Edit",IDC_LFILTER_EDITBTN,62,167,50,14\r
     PUSHBUTTON      "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14\r
@@ -1443,17 +1443,17 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN\r
 END\r
 \r
-IDD_FILEFILTERS DIALOGEX 0, 0, 356, 135\r
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION\r
+IDD_FILEFILTERS DIALOGEX 0, 0, 537, 188\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
 CAPTION "Filefilters"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    CONTROL         "",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100\r
-    PUSHBUTTON      "Test...",IDC_FILTERFILE_TEST_BTN,7,114,50,14\r
-    PUSHBUTTON      "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14\r
-    PUSHBUTTON      "New...",IDC_FILTERFILE_NEWBTN,192,114,50,14\r
-    PUSHBUTTON      "Edit...",IDC_FILTERFILE_EDITBTN,246,114,50,14\r
-    PUSHBUTTON      "Delete...",IDC_FILTERFILE_DELETEBTN,300,114,50,14\r
+    CONTROL         "",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,10,7,517,153\r
+    PUSHBUTTON      "Test...",IDC_FILTERFILE_TEST_BTN,10,167,50,14\r
+    PUSHBUTTON      "Install...",IDC_FILTERFILE_INSTALL,309,167,50,14\r
+    PUSHBUTTON      "New...",IDC_FILTERFILE_NEWBTN,364,167,50,14\r
+    PUSHBUTTON      "Edit...",IDC_FILTERFILE_EDITBTN,418,167,50,14\r
+    PUSHBUTTON      "Delete...",IDC_FILTERFILE_DELETEBTN,477,167,50,14\r
 END\r
 \r
 IDD_SAVECLOSING DIALOGEX 0, 0, 262, 217\r
@@ -2013,6 +2013,10 @@ BEGIN
     BEGIN\r
     END\r
 \r
+    IDD_FILEFILTERS, DIALOG\r
+    BEGIN\r
+    END\r
+\r
     IDD_SAVECLOSING, DIALOG\r
     BEGIN\r
     END\r
@@ -2542,6 +2546,16 @@ BEGIN
     0, 0, 100, 0\r
 END\r
 \r
+IDD_FILEFILTERS AFX_DIALOG_LAYOUT\r
+BEGIN\r
+    0\r
+END\r
+\r
+IDD_PROPPAGE_FILTER AFX_DIALOG_LAYOUT\r
+BEGIN\r
+    0\r
+END\r
+\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r