Change the "Filter:" button in the Win32 open and merge dialogs to a

"Display filter" label.

svn path=/trunk/; revision=24734

3 files changed, 21 insertions, 12 deletions

diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c
index 90401f7a46..d63d8315ed 100644
--- a/gtk/win32-file-dlg.c
+++ b/gtk/win32-file-dlg.c
@@ -148,11 +148,11 @@ win32_open_file (HWND h_wnd) {
 	 * Unfortunately all these are compiler constants, while the underlying is a
 	 * problem based is a length check of the runtime version used.
 	 *
-	 * Instead of using OPENFILENAME_SIZE_VERSION_400, just malloc 
+	 * Instead of using OPENFILENAME_SIZE_VERSION_400, just malloc
 	 * the OPENFILENAME size plus 12 bytes.
 	 * These 12 bytes are the difference between the two versions of this struct.
 	 *
-	 * Interestingly this fixes a bug, so the places bar e.g. "My Documents" 
+	 * Interestingly this fixes a bug, so the places bar e.g. "My Documents"
 	 * is displayed - which wasn't the case with the former implementation.
 	 *
 	 * XXX - It's unclear if this length+12 works on all supported platforms,
@@ -1066,7 +1066,7 @@ open_file_hook_proc(HWND of_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) {
 			g_resolv_flags |= RESOLV_TRANSPORT;
 		    break;
 		case CDN_SELCHANGE:
-		    /* This _almost_ works correctly.  We need to handle directory
+		    /* This _almost_ works correctly. We need to handle directory
 		       selections, etc. */
 		    parent = GetParent(of_hwnd);
 		    CommDlg_OpenSave_GetSpec(parent, sel_name, MAX_PATH);
@@ -1082,12 +1082,18 @@ open_file_hook_proc(HWND of_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) {
 	case WM_COMMAND:
 	    cur_ctrl = (HWND) l_param;
 	    switch(w_param) {
-		case (EN_UPDATE << 16) | EWFD_FILTER_EDIT:
-		    filter_tb_syntax_check(cur_ctrl, NULL);
-		    break;
+                case (EN_UPDATE << 16) | EWFD_FILTER_EDIT:
+                    filter_tb_syntax_check(cur_ctrl, NULL);
+                    break;
+                    /*
+                     * If we ever figure out a way to integrate the Windows
+                     * and GTK+ event loops (or make a native filter dialog),
+                     * we can re-enable the "Filter" button.
+                     */
+                    /*
                 case EWFD_FILTER_BTN:
-                    /* XXX - Integrate with the filter dialog? */
                     break;
+                     */
 		default:
 		    break;
 	    }
diff --git a/gtk/win32-file-dlg.h b/gtk/win32-file-dlg.h
index 15f9260d91..3677a71b36 100644
--- a/gtk/win32-file-dlg.h
+++ b/gtk/win32-file-dlg.h
@@ -92,7 +92,8 @@ void print_update_dynamic(HWND dlg_hwnd, print_args_t *args);
 void file_set_save_marked_sensitive();
 
 /* Open dialog defines */
-#define EWFD_FILTER_BTN    1000
+/* #define EWFD_FILTER_BTN    1000 */
+#define EWFD_FILTER_LBL    1000
 #define EWFD_FILTER_EDIT   1001
 
 #define EWFD_MAC_NR_CB     1002
diff --git a/image/win32-file-dlg.rc b/image/win32-file-dlg.rc
index 1413d8258d..34d17e12f0 100644
--- a/image/win32-file-dlg.rc
+++ b/image/win32-file-dlg.rc
@@ -7,8 +7,9 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
     // Filter button/entry
-    PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14
-    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 49, 5, 101, 12, WS_EX_CLIENTEDGE
+    // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14
+    LTEXT "Display filter:", EWFD_FILTER_LBL, 7, 7, 49, 14
+    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 52, 5, 88, 12, WS_EX_CLIENTEDGE
 
     CHECKBOX "MAC name resolution", EWFD_MAC_NR_CB, 7, 32, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 7, 47, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
@@ -62,8 +63,9 @@ STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
     // Filter button/entry
-    PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14
-    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 49, 5, 101, 12, WS_EX_CLIENTEDGE
+    // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14
+    LTEXT "Display filter:", EWFD_FILTER_LBL, 7, 7, 49, 14
+    CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 52, 5, 88, 12, WS_EX_CLIENTEDGE
 
     CONTROL  "Prepend packets to existing file", EWFD_MERGE_PREPEND_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 7, 32, 120, 8
     CONTROL  "Merge packets chronologically", EWFD_MERGE_CHRONO_BTN, "Button", BS_AUTORADIOBUTTON, 7, 47, 120, 8