aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/capture_file_dlg.c6
-rw-r--r--gtk/compat_macros.h3
-rw-r--r--gtk/conversations_table.c4
-rw-r--r--gtk/find_dlg.c3
-rw-r--r--gtk/hostlist_table.c4
-rw-r--r--gtk/io_stat.c2
-rw-r--r--gtk/print_dlg.c10
-rw-r--r--gtk/wlan_stat_dlg.c4
8 files changed, 16 insertions, 20 deletions
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index 7e3bd66794..73f630ebf1 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -518,7 +518,7 @@ file_open_cmd(GtkWidget *w)
#endif
/* resolve buttons */
- m_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Enable _MAC name resolution", accel_group);
+ m_resolv_cb = gtk_check_button_new_with_mnemonic("Enable _MAC name resolution");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_resolv_cb),
g_resolv_flags & RESOLV_MAC);
gtk_box_pack_start(GTK_BOX(main_vb), m_resolv_cb, FALSE, FALSE, 0);
@@ -531,7 +531,7 @@ file_open_cmd(GtkWidget *w)
#endif
gtk_widget_show(m_resolv_cb);
- n_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Enable _network name resolution", accel_group);
+ n_resolv_cb = gtk_check_button_new_with_mnemonic("Enable _network name resolution");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(n_resolv_cb),
g_resolv_flags & RESOLV_NETWORK);
gtk_box_pack_start(GTK_BOX(main_vb), n_resolv_cb, FALSE, FALSE, 0);
@@ -543,7 +543,7 @@ file_open_cmd(GtkWidget *w)
E_FILE_N_RESOLVE_KEY, n_resolv_cb);
#endif
- t_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Enable _transport name resolution", accel_group);
+ t_resolv_cb = gtk_check_button_new_with_mnemonic("Enable _transport name resolution");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t_resolv_cb),
g_resolv_flags & RESOLV_TRANSPORT);
gtk_box_pack_start(GTK_BOX(main_vb), t_resolv_cb, FALSE, FALSE, 0);
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index c24eeafbb7..ea6c11f936 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -158,9 +158,6 @@ gtk_widget_set_size_request(GTK_WIDGET(widget), width, height)
#define WIRESHARK_STOCK_COLOR9 "Wireshark_Stock_Color_9"
#define WIRESHARK_STOCK_COLOR0 "Wireshark_Stock_Color_10"
-#define CHECK_BUTTON_NEW_WITH_MNEMONIC(label_text, accel_group) \
-gtk_check_button_new_with_mnemonic(label_text)
-
#define RADIO_BUTTON_NEW_WITH_MNEMONIC(radio_group, label_text, accel_group) \
gtk_radio_button_new_with_mnemonic_from_widget( \
radio_group ? GTK_RADIO_BUTTON(radio_group) : NULL, label_text)
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 8fbd5a4241..665a4b8811 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -1661,7 +1661,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Name resolution", NULL);
+ resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution");
gtk_container_add(GTK_CONTAINER(hbox), resolv_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
gtk_tooltips_set_tip(tooltips, resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
@@ -1669,7 +1669,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
SIGNAL_CONNECT(resolv_cb, "toggled", ct_resolve_toggle_dest, pages);
- filter_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Limit to display filter", NULL);
+ filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
gtk_container_add(GTK_CONTAINER(hbox), filter_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to conversations matching the current display filter.", NULL);
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 57ee796794..7246469557 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -265,8 +265,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_container_border_width(GTK_CONTAINER(string_opt_vb), 3);
gtk_widget_show(string_opt_vb);
- case_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
- "Case sensitive", accel_group);
+ case_cb = gtk_check_button_new_with_mnemonic("Case sensitive");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(case_cb), !case_type);
gtk_container_add(GTK_CONTAINER(string_opt_vb), case_cb);
gtk_tooltips_set_tip (tooltips, case_cb, ("Search by mixed upper/lower case?"), NULL);
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 99b19c0e1b..96003dcef5 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -1031,7 +1031,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Name resolution", NULL);
+ resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution");
gtk_container_add(GTK_CONTAINER(hbox), resolv_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
gtk_tooltips_set_tip(tooltips, resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
@@ -1039,7 +1039,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
SIGNAL_CONNECT(resolv_cb, "toggled", hostlist_resolve_toggle_dest, pages);
- filter_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Limit to display filter", NULL);
+ filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
gtk_container_add(GTK_CONTAINER(hbox), filter_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
gtk_tooltips_set_tip(tooltips, filter_cb, "Limit the list to endpoints matching the current display filter.", NULL);
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index dabf3a97a6..bde44ef9c1 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1645,7 +1645,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box)
create_ctrl_menu(io, vbox, "Tick interval:", create_tick_interval_menu_items);
create_ctrl_menu(io, vbox, "Pixels per tick:", create_pixels_per_tick_menu_items);
- view_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("_View as time of day", accel_group);
+ view_cb = gtk_check_button_new_with_mnemonic("_View as time of day");
gtk_container_add(GTK_CONTAINER(vbox), view_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(view_cb), io->view_as_time);
SIGNAL_CONNECT(view_cb, "toggled", view_as_time_toggle_dest, io);
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 8e2fa5a4e7..ab108ffa26 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -596,7 +596,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
/* Output to file button */
- dest_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Output to _file:", accel_group);
+ dest_cb = gtk_check_button_new_with_mnemonic("Output to _file:");
if (args->to_file)
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(dest_cb), TRUE);
gtk_tooltips_set_tip (tooltips, dest_cb, "Output to file instead of printer", NULL);
@@ -684,7 +684,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
gtk_widget_show(format_vb);
/* "Print summary line" check button */
- summary_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Packet summary line", accel_group);
+ summary_cb = gtk_check_button_new_with_mnemonic("Packet summary line");
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(summary_cb), args->print_summary);
SIGNAL_CONNECT(summary_cb, "clicked", print_cmd_toggle_detail, main_win);
gtk_tooltips_set_tip (tooltips, summary_cb, "Output of a packet summary line, like in the packet list", NULL);
@@ -693,7 +693,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
/* "Details" check button */
- details_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Packet details:", accel_group);
+ details_cb = gtk_check_button_new_with_mnemonic("Packet details:");
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(details_cb), args->print_dissections != print_dissections_none);
SIGNAL_CONNECT(details_cb, "clicked", print_cmd_toggle_detail, main_win);
gtk_tooltips_set_tip (tooltips, details_cb, "Output format of the selected packet details (protocol tree).", NULL);
@@ -736,7 +736,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
gtk_widget_show(expand_all_rb);
/* "Print hex" check button. */
- hex_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Packet bytes", accel_group);
+ hex_cb = gtk_check_button_new_with_mnemonic("Packet bytes");
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hex_cb), args->print_hex);
SIGNAL_CONNECT(hex_cb, "clicked", print_cmd_toggle_detail, main_win);
gtk_tooltips_set_tip (tooltips, hex_cb, "Add a hexdump of the packet data", NULL);
@@ -749,7 +749,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
gtk_widget_show(sep);
/* "Each packet on a new page" check button. */
- formfeed_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Each packet on a new page", accel_group);
+ formfeed_cb = gtk_check_button_new_with_mnemonic("Each packet on a new page");
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(formfeed_cb), args->print_formfeed);
gtk_tooltips_set_tip (tooltips, formfeed_cb, "When checked, a new page will be used for each packet. "
"This is done by adding a formfeed (or similar) between the packet outputs.", NULL);
diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c
index 3ea61ad6bb..f8c2d6acae 100644
--- a/gtk/wlan_stat_dlg.c
+++ b/gtk/wlan_stat_dlg.c
@@ -514,7 +514,7 @@ wlanstat_dlg_create (void)
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Name resolution", NULL);
+ resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution");
gtk_container_add(GTK_CONTAINER(hbox), resolv_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
gtk_tooltips_set_tip(tooltips, resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
@@ -522,7 +522,7 @@ wlanstat_dlg_create (void)
SIGNAL_CONNECT(resolv_cb, "toggled", wlan_resolve_toggle_dest, hs);
- existing_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Only show existing networks", NULL);
+ existing_cb = gtk_check_button_new_with_mnemonic("Only show existing networks");
gtk_container_add(GTK_CONTAINER(hbox), existing_cb);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(existing_cb), FALSE);
gtk_tooltips_set_tip(tooltips, existing_cb, "This option disables probe requests for "
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 16:16:42 +0000