diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-16 19:47:43 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-16 19:47:43 +0000 |
| commit | 9f1fd13e9a678b361840a016f55d564e028f87bf (patch) | |
| tree | d2894dd2301b2e44a7c7b8a59f4eff2a9f0908f5 /ui/win32 | |
| parent | 696ea123be7da4b81e52dc4d65a078d97fd0c2ba (diff) | |
Use topic_action instead of topic_cb for the Windows file dialogs. Move
the common Qt help code to wireshark_application.cpp.
svn path=/trunk/; revision=45594
Diffstat (limited to 'ui/win32')
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 88341eb7d3..ad1bb6478a 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -52,6 +52,7 @@ #include "merge.h" #include "ui/alert_box.h" +#include "ui/help_url.h" #include "ui/file_dialog.h" #include "ui/last_open_dir.h" #include "ui/simple_dialog.h" @@ -65,7 +66,6 @@ #include "ui/gtk/drag_and_drop.h" #include "ui/gtk/capture_dlg.h" #include "file_dlg_win32.h" -#include "ui/gtk/help_dlg.h" #include "ui/gtk/export_sslkeys.h" #define FILE_OPEN_DEFAULT 1 /* All Files */ @@ -1399,7 +1399,7 @@ open_file_hook_proc(HWND of_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { preview_set_file_info(of_hwnd, utf_16to8(sel_name)); break; case CDN_HELP: - topic_cb(NULL, HELP_OPEN_WIN32_DIALOG); + topic_action(HELP_OPEN_WIN32_DIALOG); break; default: break; @@ -1659,7 +1659,7 @@ save_as_file_hook_proc(HWND sf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { case WM_NOTIFY: switch (notify->hdr.code) { case CDN_HELP: - topic_cb(NULL, HELP_SAVE_WIN32_DIALOG); + topic_action(HELP_SAVE_WIN32_DIALOG); break; case CDN_FILEOK: { HWND parent; @@ -1764,7 +1764,7 @@ export_specified_packets_file_hook_proc(HWND sf_hwnd, UINT msg, WPARAM w_param, case WM_NOTIFY: switch (notify->hdr.code) { case CDN_HELP: - topic_cb(NULL, HELP_SAVE_WIN32_DIALOG); + topic_action(HELP_SAVE_WIN32_DIALOG); break; case CDN_FILEOK: { HWND parent; @@ -2163,7 +2163,7 @@ merge_file_hook_proc(HWND mf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { preview_set_file_info(mf_hwnd, utf_16to8(sel_name)); break; case CDN_HELP: - topic_cb(NULL, HELP_MERGE_WIN32_DIALOG); + topic_action(HELP_MERGE_WIN32_DIALOG); break; default: break; @@ -2234,7 +2234,7 @@ export_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { } break; case CDN_HELP: - topic_cb(NULL, HELP_EXPORT_FILE_WIN32_DIALOG); + topic_action(HELP_EXPORT_FILE_WIN32_DIALOG); break; default: break; @@ -2263,7 +2263,7 @@ export_raw_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_param case WM_NOTIFY: switch (notify->hdr.code) { case CDN_HELP: - topic_cb(NULL, HELP_EXPORT_BYTES_WIN32_DIALOG); + topic_action(HELP_EXPORT_BYTES_WIN32_DIALOG); break; default: break; @@ -2291,7 +2291,7 @@ export_sslkeys_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_p case WM_NOTIFY: switch (notify->hdr.code) { case CDN_HELP: - topic_cb(NULL, HELP_EXPORT_BYTES_WIN32_DIALOG); + topic_action(HELP_EXPORT_BYTES_WIN32_DIALOG); break; default: break; |