aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2010-11-22 19:45:03 +0000
committerBill Meier <wmeier@newsguy.com>2010-11-22 19:45:03 +0000
commit613efa359b086470ac9a67becf59edb81d66beb9 (patch)
tree535cc2412267a4cb05bb44c88b3a6f6b665a917f /gtk
parent1b04b1b765378b576c8ae5c66b28c734d4bdeab0 (diff)
Remove print_update_dynamic() decl from file_dlg_win32.h since only used in [...].c
svn path=/trunk/; revision=35008
Diffstat (limited to 'gtk')
-rw-r--r--gtk/file_dlg_win32.c92
-rw-r--r--gtk/file_dlg_win32.h9
2 files changed, 49 insertions, 52 deletions
diff --git a/gtk/file_dlg_win32.c b/gtk/file_dlg_win32.c
index 3ce1a6b8fe..5f180b02c0 100644
--- a/gtk/file_dlg_win32.c
+++ b/gtk/file_dlg_win32.c
@@ -838,49 +838,13 @@ win32_import_color_file(HWND h_wnd, gpointer color_filters) {
/*
* Private routines
*/
-static void
-format_handle_wm_initdialog(HWND dlg_hwnd, print_args_t *args) {
- HWND cur_ctrl;
-
- /* Set the "Packet summary" box */
- cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_SUMMARY_CB);
- SendMessage(cur_ctrl, BM_SETCHECK, args->print_summary, 0);
-
- /* Set the "Packet details" box */
- cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_DETAIL_CB);
- SendMessage(cur_ctrl, BM_SETCHECK, args->print_dissections != print_dissections_none, 0);
-
- /* Set the "Packet details" combo */
- cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_DETAIL_COMBO);
- SendMessage(cur_ctrl, CB_ADDSTRING, 0, (WPARAM) _T("All collapsed"));
- SendMessage(cur_ctrl, CB_ADDSTRING, 0, (WPARAM) _T("As displayed"));
- SendMessage(cur_ctrl, CB_ADDSTRING, 0, (WPARAM) _T("All expanded"));
-
- switch (args->print_dissections) {
- case print_dissections_none:
- case print_dissections_collapsed:
- SendMessage(cur_ctrl, CB_SETCURSEL, 0, 0);
- break;
- case print_dissections_as_displayed:
- SendMessage(cur_ctrl, CB_SETCURSEL, 1, 0);
- break;
- case print_dissections_expanded:
- SendMessage(cur_ctrl, CB_SETCURSEL, 2, 0);
- default:
- g_assert_not_reached();
- }
-
- /* Set the "Packet bytes" box */
- cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_BYTES_CB);
- SendMessage(cur_ctrl, BM_SETCHECK, args->print_hex, 0);
-
- /* Set the "Each packet on a new page" box */
- cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_NEW_PAGE_CB);
- SendMessage(cur_ctrl, BM_SETCHECK, args->print_formfeed, 0);
-
- print_update_dynamic(dlg_hwnd, args);
-}
+/** Given a print_args_t struct, update a set of print/export format controls
+ * accordingly.
+ *
+ * @param dlg_hwnd HWND of the dialog in question.
+ * @param args Pointer to a print args struct.
+ */
static void
print_update_dynamic(HWND dlg_hwnd, print_args_t *args) {
HWND cur_ctrl;
@@ -927,9 +891,51 @@ print_update_dynamic(HWND dlg_hwnd, print_args_t *args) {
args->print_formfeed = FALSE;
}
+static void
+format_handle_wm_initdialog(HWND dlg_hwnd, print_args_t *args) {
+ HWND cur_ctrl;
-#define PREVIEW_STR_MAX 200
+ /* Set the "Packet summary" box */
+ cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_SUMMARY_CB);
+ SendMessage(cur_ctrl, BM_SETCHECK, args->print_summary, 0);
+
+ /* Set the "Packet details" box */
+ cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_DETAIL_CB);
+ SendMessage(cur_ctrl, BM_SETCHECK, args->print_dissections != print_dissections_none, 0);
+
+ /* Set the "Packet details" combo */
+ cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_DETAIL_COMBO);
+ SendMessage(cur_ctrl, CB_ADDSTRING, 0, (WPARAM) _T("All collapsed"));
+ SendMessage(cur_ctrl, CB_ADDSTRING, 0, (WPARAM) _T("As displayed"));
+ SendMessage(cur_ctrl, CB_ADDSTRING, 0, (WPARAM) _T("All expanded"));
+
+ switch (args->print_dissections) {
+ case print_dissections_none:
+ case print_dissections_collapsed:
+ SendMessage(cur_ctrl, CB_SETCURSEL, 0, 0);
+ break;
+ case print_dissections_as_displayed:
+ SendMessage(cur_ctrl, CB_SETCURSEL, 1, 0);
+ break;
+ case print_dissections_expanded:
+ SendMessage(cur_ctrl, CB_SETCURSEL, 2, 0);
+ default:
+ g_assert_not_reached();
+ }
+
+ /* Set the "Packet bytes" box */
+ cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_BYTES_CB);
+ SendMessage(cur_ctrl, BM_SETCHECK, args->print_hex, 0);
+
+ /* Set the "Each packet on a new page" box */
+ cur_ctrl = GetDlgItem(dlg_hwnd, EWFD_PKT_NEW_PAGE_CB);
+ SendMessage(cur_ctrl, BM_SETCHECK, args->print_formfeed, 0);
+ print_update_dynamic(dlg_hwnd, args);
+}
+
+
+#define PREVIEW_STR_MAX 200
/* If preview_file is NULL, disable the elements. If not, enable and
* show the preview info. */
diff --git a/gtk/file_dlg_win32.h b/gtk/file_dlg_win32.h
index a607d378bc..9fab732f0f 100644
--- a/gtk/file_dlg_win32.h
+++ b/gtk/file_dlg_win32.h
@@ -81,15 +81,6 @@ void win32_export_color_file(HWND h_wnd, gpointer filter_list);
*/
void win32_import_color_file(HWND h_wnd, gpointer color_filters);
-/** Given a print_args_t struct, update a set of print/export format controls
- * accordingly.
- *
- * @param dlg_hwnd HWND of the dialog in question.
- * @param args Pointer to a print args struct.
- */
-/* XXX - This should be moved to win32-print.c, maybe? */
-void print_update_dynamic(HWND dlg_hwnd, print_args_t *args);
-
void file_set_save_marked_sensitive();
/* Open dialog defines */