diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-29 10:11:24 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-29 10:11:24 +0000 |
commit | e7473cc3398c30195c728d168398e1b306e1bc91 (patch) | |
tree | 8d3bc188dc8d41b53c03ef6f6dad02e4898a1e63 /gtk | |
parent | 47b583a107fd6e3eb26c4b33455a58f12bcc825e (diff) |
Remove remaining direct access to GTK structs in Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38251 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/airpcap_dlg.c | 12 | ||||
-rw-r--r-- | gtk/capture_file_dlg.c | 10 | ||||
-rw-r--r-- | gtk/export_sslkeys.c | 2 | ||||
-rw-r--r-- | gtk/gsm_a_stat.c | 2 | ||||
-rw-r--r-- | gtk/main_proto_draw.c | 2 | ||||
-rw-r--r-- | gtk/print_dlg.c | 12 |
6 files changed, 22 insertions, 18 deletions
diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c index 4e7a69c873..4d1748d79b 100644 --- a/gtk/airpcap_dlg.c +++ b/gtk/airpcap_dlg.c @@ -2709,10 +2709,14 @@ on_keys_check_ok_bt_clicked (GtkWidget *button _U_, gpointer user_data) ignore_rb = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IGNORE_KEY); /* Find out which radio button is selected and call the correct function */ - if (GTK_TOGGLE_BUTTON(merge_rb)->active) on_merge_bt_clicked (merge_rb,keys_check_w); - else if (GTK_TOGGLE_BUTTON(keep_rb)->active) on_keep_bt_clicked (keep_rb,keys_check_w); - else if (GTK_TOGGLE_BUTTON(import_rb)->active) on_import_bt_clicked (import_rb,keys_check_w); - else if (GTK_TOGGLE_BUTTON(ignore_rb)->active) on_ignore_bt_clicked (ignore_rb,keys_check_w); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(merge_rb))) + on_merge_bt_clicked (merge_rb,keys_check_w); + else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(keep_rb))) + on_keep_bt_clicked (keep_rb,keys_check_w); + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(import_rb))) + on_import_bt_clicked (import_rb,keys_check_w); + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ignore_rb))) + on_ignore_bt_clicked (ignore_rb,keys_check_w); else on_keys_check_cancel_bt_clicked(NULL,keys_check_w); } diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index d1f17c8ebd..e33333d701 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -450,7 +450,7 @@ static void file_open_cmd(GtkWidget *w) { #if _WIN32 - win32_open_file(GDK_WINDOW_HWND(top_level->window)); + win32_open_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level))); #else /* _WIN32 */ GtkWidget *main_hb, *main_vb, *filter_hbox, *filter_bt, *filter_te, *m_resolv_cb, *n_resolv_cb, *t_resolv_cb, *prev; @@ -736,7 +736,7 @@ static void file_merge_cmd(GtkWidget *w) { #if _WIN32 - win32_merge_file(GDK_WINDOW_HWND(top_level->window)); + win32_merge_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level))); new_packet_list_freeze(); new_packet_list_thaw(); #else /* _WIN32 */ @@ -1182,7 +1182,7 @@ void file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_save_data) { #if _WIN32 - win32_save_as_file(GDK_WINDOW_HWND(top_level->window), action_after_save, action_after_save_data); + win32_save_as_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), action_after_save, action_after_save_data); #else /* _WIN32 */ GtkWidget *main_vb, *ft_hb, *ft_lb, *ft_combo_box, *range_fr, *compressed_cb; gint combo_box_item_to_select; @@ -1516,7 +1516,7 @@ void file_color_import_cmd_cb(GtkWidget *color_filters, gpointer filter_list _U_) { #if _WIN32 - win32_import_color_file(GDK_WINDOW_HWND(top_level->window), color_filters); + win32_import_color_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), color_filters); #else /* _WIN32 */ GtkWidget *main_vb, *cfglobal_but; @@ -1649,7 +1649,7 @@ void file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list) { #if _WIN32 - win32_export_color_file(GDK_WINDOW_HWND(top_level->window), filter_list); + win32_export_color_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), filter_list); #else /* _WIN32 */ GtkWidget *main_vb, *cfglobal_but; GtkWidget *cfselect_cb; diff --git a/gtk/export_sslkeys.c b/gtk/export_sslkeys.c index 199238c960..fbb61e699d 100644 --- a/gtk/export_sslkeys.c +++ b/gtk/export_sslkeys.c @@ -217,7 +217,7 @@ savesslkeys_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_) void savesslkeys_cb(GtkWidget * w _U_, gpointer data _U_) { - win32_export_sslkeys_file(GDK_WINDOW_HWND(top_level->window)); + win32_export_sslkeys_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level))); return; } #else diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 34b5bfad8b..9151050baf 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -745,7 +745,7 @@ gsm_a_stat_gtk_sacch_rr_cb( */ if (dlg_sacch_rr.win) { - gdk_window_raise(dlg_sacch_rr.win->window); + gdk_window_raise(gtk_widget_get_window(dlg_sacch_rr.win)); return; } diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c index 7084700445..39b070c801 100644 --- a/gtk/main_proto_draw.c +++ b/gtk/main_proto_draw.c @@ -1034,7 +1034,7 @@ savehex_save_clicked_cb(GtkWidget * w _U_, gpointer data _U_) void savehex_cb(GtkWidget * w _U_, gpointer data _U_) { - win32_export_raw_file(GDK_WINDOW_HWND(top_level->window)); + win32_export_raw_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level))); return; } #else diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index 8fde1e664d..6f95902dbc 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -186,7 +186,7 @@ static gboolean export_text_prefs_init = FALSE; void export_text_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { - win32_export_file(GDK_WINDOW_HWND(top_level->window), export_type_text); + win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), export_type_text); return; } #else @@ -239,7 +239,7 @@ static gboolean export_ps_prefs_init = FALSE; void export_ps_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { - win32_export_file(GDK_WINDOW_HWND(top_level->window), export_type_ps); + win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), export_type_ps); return; } #else @@ -292,7 +292,7 @@ static gboolean export_psml_prefs_init = FALSE; void export_psml_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { - win32_export_file(GDK_WINDOW_HWND(top_level->window), export_type_psml); + win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), export_type_psml); return; } #else @@ -344,7 +344,7 @@ static gboolean export_pdml_prefs_init = FALSE; void export_pdml_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { - win32_export_file(GDK_WINDOW_HWND(top_level->window), export_type_pdml); + win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), export_type_pdml); return; } #else @@ -395,7 +395,7 @@ static gboolean export_csv_prefs_init = FALSE; void export_csv_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { - win32_export_file(GDK_WINDOW_HWND(top_level->window), export_type_csv); + win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), export_type_csv); return; } #else @@ -446,7 +446,7 @@ static gboolean export_carrays_prefs_init = FALSE; void export_carrays_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { - win32_export_file(GDK_WINDOW_HWND(top_level->window), export_type_carrays); + win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), export_type_carrays); return; } #else |