aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/gtk/bootp_stat.c4
-rw-r--r--ui/gtk/bytes_view.c10
-rw-r--r--ui/gtk/color_edit_dlg.c4
-rw-r--r--ui/gtk/fileset_dlg.c16
-rw-r--r--ui/gtk/gui_utils.h2
-rw-r--r--ui/gtk/iax2_analysis.c12
-rw-r--r--ui/gtk/io_stat.c10
-rw-r--r--ui/gtk/prefs_column.c12
-rw-r--r--ui/gtk/prefs_font_color.c10
-rw-r--r--ui/gtk/print_dlg.c10
-rw-r--r--ui/gtk/rtp_analysis.c2
-rw-r--r--ui/gtk/sctp_byte_graph_dlg.c2
-rw-r--r--ui/gtk/sctp_graph_dlg.c2
-rw-r--r--ui/gtk/tcp_graph.c50
14 files changed, 73 insertions, 73 deletions
diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c
index 5bc5dfa3a0..4a4d18ea04 100644
--- a/ui/gtk/bootp_stat.c
+++ b/ui/gtk/bootp_stat.c
@@ -87,14 +87,14 @@ dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar *unused
/* g_snprintf(string_buff, sizeof(string_buff), "%s (0X%x)", data->name, *key); */
tmp = gtk_label_new(data->name /* string_buff */);
ws_gtk_grid_attach_extended(GTK_GRID(data->sp->grid_message_type), tmp, x, y, 1, 1,
- GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT);
gtk_widget_show(tmp);
g_snprintf(string_buff, sizeof(string_buff), "%9d", data->packets);
data->widget = gtk_label_new(string_buff);
ws_gtk_grid_attach_extended(GTK_GRID(data->sp->grid_message_type), data->widget, x+1, y, 1, 1,
- GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_label_set_justify(GTK_LABEL(data->widget), GTK_JUSTIFY_LEFT);
gtk_widget_show(data->widget);
diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c
index e9cc4f286b..61362cdcab 100644
--- a/ui/gtk/bytes_view.c
+++ b/ui/gtk/bytes_view.c
@@ -472,7 +472,7 @@ bytes_view_flush_render(BytesView *bv, void *data, int x, int y, const char *str
/* background */
#if GTK_CHECK_VERSION(3, 0, 0)
- gtk_style_context_get_background_color(context, GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_SELECTED, &bg_color);
+ gtk_style_context_get_background_color(context, (GtkStateFlags)(GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_SELECTED), &bg_color);
gdk_cairo_set_source_rgba(cr, &bg_color);
#else
gdk_cairo_set_source_color(cr, &gtk_widget_get_style(GTK_WIDGET(bv))->base[bv->state]);
@@ -483,7 +483,7 @@ bytes_view_flush_render(BytesView *bv, void *data, int x, int y, const char *str
/* text */
#if GTK_CHECK_VERSION(3, 0, 0)
- gtk_style_context_get_color(context, GTK_STATE_FLAG_FOCUSED | (bv->state == GTK_STATE_SELECTED ? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_NORMAL), &fg_color);
+ gtk_style_context_get_color(context, (GtkStateFlags)(GTK_STATE_FLAG_FOCUSED | (bv->state == GTK_STATE_SELECTED ? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_NORMAL)), &fg_color);
gdk_cairo_set_source_rgba(cr, &fg_color);
#else
gdk_cairo_set_source_color(cr, &gtk_widget_get_style(GTK_WIDGET(bv))->text[bv->state]);
@@ -813,7 +813,7 @@ bytes_view_render(BytesView *bv, cairo_t *cr, GdkRectangle *area)
/* clear */
#if GTK_CHECK_VERSION(3, 0, 0)
context = gtk_widget_get_style_context(GTK_WIDGET(bv));
- gtk_style_context_get_background_color(context, GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_NORMAL, &bg_color);
+ gtk_style_context_get_background_color(context, (GtkStateFlags)(GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_NORMAL), &bg_color);
gdk_cairo_set_source_rgba(cr, &bg_color);
#else
gdk_cairo_set_source_color(cr, &gtk_widget_get_style(GTK_WIDGET(bv))->base[GTK_STATE_NORMAL]);
@@ -1069,11 +1069,11 @@ bytes_view_set_property(GObject *object, guint prop_id, const GValue *value, GPa
switch (prop_id) {
case PROP_HADJUSTMENT:
- bytes_view_set_scroll_adjustments(bv, g_value_get_object(value), bv->vadj);
+ bytes_view_set_scroll_adjustments(bv, (GtkAdjustment *)g_value_get_object(value), bv->vadj);
break;
case PROP_VADJUSTMENT:
- bytes_view_set_scroll_adjustments(bv, bv->hadj, g_value_get_object(value));
+ bytes_view_set_scroll_adjustments(bv, bv->hadj, (GtkAdjustment *)g_value_get_object(value));
break;
case PROP_HSCROLL_POLICY:
diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c
index 25a62862da..0afdd00e58 100644
--- a/ui/gtk/color_edit_dlg.c
+++ b/ui/gtk/color_edit_dlg.c
@@ -418,8 +418,8 @@ color_edit_dlg_ok_cb(GtkWidget *w _U_, gpointer user_data)
context = gtk_widget_get_style_context (cedi->filt_name_entry);
- gtk_style_context_get_color(context, GTK_STATE_NORMAL, &new_rgba_fg_color); /* aka foreground color */
- gtk_style_context_get_background_color(context, GTK_STATE_NORMAL, &new_rgba_bg_color);
+ gtk_style_context_get_color(context, (GtkStateFlags)GTK_STATE_NORMAL, &new_rgba_fg_color); /* aka foreground color */
+ gtk_style_context_get_background_color(context, (GtkStateFlags)GTK_STATE_NORMAL, &new_rgba_bg_color);
gdkRGBAcolor_to_color_t(&colorf->fg_color, &new_rgba_fg_color);
gdkRGBAcolor_to_color_t(&colorf->bg_color, &new_rgba_bg_color);
diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index 55b7fc4fa6..fa8f6e5295 100644
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -186,22 +186,22 @@ fileset_dlg_add_file(fileset_entry *entry, void *window _U_) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (fs_rb), entry->current);
}
gtk_widget_set_tooltip_text(fs_rb, "Open this capture file");
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_rb, 0, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_rb, 0, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
g_signal_connect(fs_rb, "toggled", G_CALLBACK(fs_rb_cb), entry);
gtk_widget_show(fs_rb);
fs_lb = gtk_label_new(created);
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(fs_lb, entry->current);
gtk_widget_show(fs_lb);
fs_lb = gtk_label_new(modified);
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(fs_lb, entry->current);
gtk_widget_show(fs_lb);
fs_lb = gtk_label_new(size);
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(fs_lb, entry->current);
gtk_widget_show(fs_lb);
@@ -257,16 +257,16 @@ fileset_init_table(GtkWidget *parent_vb)
fs_first_rb = NULL;
fs_lb = gtk_label_new("Filename");
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 0, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 0, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
fs_lb = gtk_label_new("Created");
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
fs_lb = gtk_label_new("Last Modified");
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
fs_lb = gtk_label_new("Size");
- ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_hide(fs_grid);
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index 8179d43202..945fdab94e 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -608,7 +608,7 @@ typedef GtkTable GtkGrid;
gtk_table_attach_defaults(grid, child, left, left+width, top, top+height)
#define ws_gtk_grid_attach_extended(grid, child, left, top, width, height, xoptions, yoptions, xpadding, ypadding) \
- gtk_table_attach(grid, child, left, left+width, top, top+height, (GtkAttachOptions)(xoptions), (GtkAttachOptions)(yoptions), xpadding, ypadding)
+ gtk_table_attach(grid, child, left, left+width, top, top+height, xoptions, yoptions, xpadding, ypadding)
#define ws_gtk_grid_set_homogeneous(grid, homogeneous) \
gtk_table_set_homogeneous(grid, homogeneous)
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 751c58b53f..f721d4b5dd 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -1453,7 +1453,7 @@ draw_area_destroy_cb(GtkWidget *widget _U_, gpointer data)
static
gboolean draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data)
{
- user_data_t *user_data = data;
+ user_data_t *user_data = (user_data_t *)data;
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
@@ -1637,12 +1637,12 @@ create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num)
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION(3,0,0)
- gtk_widget_override_color(label, GTK_STATE_FLAG_NORMAL, &dgg->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_FLAG_NORMAL, &dgg->rgba_color);
/* XXX gtk_widget_override_color() takes flags not state */
- gtk_widget_override_color(label, GTK_STATE_ACTIVE, &dgg->rgba_color);
- gtk_widget_override_color(label, GTK_STATE_PRELIGHT, &dgg->rgba_color);
- gtk_widget_override_color(label, GTK_STATE_SELECTED, &dgg->rgba_color);
- gtk_widget_override_color(label, GTK_STATE_INSENSITIVE, &dgg->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_ACTIVE, &dgg->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_PRELIGHT, &dgg->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_SELECTED, &dgg->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_INSENSITIVE, &dgg->rgba_color);
#else
gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &dgg->color);
gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &dgg->color);
diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index cd5cea486e..0d35cabb17 100644
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -2238,12 +2238,12 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
#if GTK_CHECK_VERSION(3,0,0)
- gtk_widget_override_color(label, GTK_STATE_FLAG_NORMAL, &gio->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_FLAG_NORMAL, &gio->rgba_color);
/* XXX gtk_widget_override_color() takes flags not state */
- gtk_widget_override_color(label, GTK_STATE_ACTIVE, &gio->rgba_color);
- gtk_widget_override_color(label, GTK_STATE_PRELIGHT, &gio->rgba_color);
- gtk_widget_override_color(label, GTK_STATE_SELECTED, &gio->rgba_color);
- gtk_widget_override_color(label, GTK_STATE_INSENSITIVE, &gio->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_ACTIVE, &gio->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_PRELIGHT, &gio->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_SELECTED, &gio->rgba_color);
+ gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_INSENSITIVE, &gio->rgba_color);
#else
gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &gio->color);
gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &gio->color);
diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c
index 9cd2e3fa3a..4032801d80 100644
--- a/ui/gtk/prefs_column.c
+++ b/ui/gtk/prefs_column.c
@@ -253,18 +253,18 @@ column_prefs_show(GtkWidget *prefs_window) {
lb = gtk_label_new("Field type:");
gtk_misc_set_alignment(GTK_MISC(lb), 0.0f, 0.5f);
- ws_gtk_grid_attach_extended(GTK_GRID(grid), lb, 0, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(grid), lb, 0, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_tooltip_text(lb, "Select which packet information to present in the column.");
gtk_widget_show(lb);
props_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
- ws_gtk_grid_attach_extended(GTK_GRID(grid), props_hb, 1, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(grid), props_hb, 1, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_tooltip_text(props_hb, "Select which packet information to present in the column.");
gtk_widget_show(props_hb);
field_lb = gtk_label_new("Field name:");
gtk_misc_set_alignment(GTK_MISC(field_lb), 0.0f, 0.5f);
- ws_gtk_grid_attach_extended(GTK_GRID(grid), field_lb, 0, 1, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(grid), field_lb, 0, 1, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(field_lb, FALSE);
gtk_widget_set_tooltip_text(field_lb,
"Field name used when field type is \"Custom\". "
@@ -285,7 +285,7 @@ column_prefs_show(GtkWidget *prefs_window) {
g_signal_connect(field_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(prefs_window, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
colorize_filter_te_as_empty(field_te);
- ws_gtk_grid_attach_extended(GTK_GRID(grid), field_te, 1, 1, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(grid), field_te, 1, 1, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(field_te, FALSE);
gtk_widget_set_tooltip_text(field_te,
"Field name used when field type is \"Custom\". "
@@ -294,7 +294,7 @@ column_prefs_show(GtkWidget *prefs_window) {
occurrence_lb = gtk_label_new("Field occurrence:");
gtk_misc_set_alignment(GTK_MISC(occurrence_lb), 0.0f, 0.5f);
- ws_gtk_grid_attach_extended(GTK_GRID(grid), occurrence_lb, 2, 1, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(grid), occurrence_lb, 2, 1, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(occurrence_lb, FALSE);
gtk_widget_set_tooltip_text(occurrence_lb,
"Field occurrence to use. "
@@ -310,7 +310,7 @@ column_prefs_show(GtkWidget *prefs_window) {
column_occurrence_changed_handler_id =
g_signal_connect(occurrence_te, "changed", G_CALLBACK(column_occurrence_changed_cb), column_l);
- ws_gtk_grid_attach_extended(GTK_GRID(grid), occurrence_te, 3, 1, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(grid), occurrence_te, 3, 1, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(occurrence_te, FALSE);
gtk_widget_set_tooltip_text(occurrence_te,
"Field occurrence to use. "
diff --git a/ui/gtk/prefs_font_color.c b/ui/gtk/prefs_font_color.c
index bf55fe3785..201ecddd8f 100644
--- a/ui/gtk/prefs_font_color.c
+++ b/ui/gtk/prefs_font_color.c
@@ -180,7 +180,7 @@ font_color_prefs_show(void)
gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f);
ws_gtk_grid_attach_extended(GTK_GRID(main_grid), label,
0, GRID_FONT_ROW, 1, 1,
- GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_show(label);
font_button = gtk_font_button_new_with_font(prefs.gui_gtk2_font_name);
@@ -200,7 +200,7 @@ font_color_prefs_show(void)
gtk_text_buffer_insert(buf, &iter, preview_string->str, -1);
ws_gtk_grid_attach_extended(GTK_GRID(main_grid), font_sample,
2, GRID_FONT_ROW, 1, 1,
- GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
g_signal_connect(font_button, "font-set", G_CALLBACK(select_font), NULL);
gtk_widget_show(font_sample);
@@ -211,7 +211,7 @@ font_color_prefs_show(void)
gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f);
ws_gtk_grid_attach_extended(GTK_GRID(main_grid), label,
0, GRID_COLOR_ROW, 1, 1,
- GTK_EXPAND|GTK_FILL, 0, 0,0);
+ (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0,0);
gtk_widget_show(label);
/* We have to create this now, and configure it below. */
@@ -274,13 +274,13 @@ font_color_prefs_show(void)
ws_gtk_grid_attach_extended(GTK_GRID(main_grid), color_sample,
2, GRID_COLOR_ROW, 1, 2,
- GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_show(color_sample);
gtk_color_xxx_set_yyy(GTK_COLOR_XXX(colorsel), curcolor);
ws_gtk_grid_attach_extended(GTK_GRID(main_grid), colorsel,
1, GRID_COLOR_SEL_ROW, 2, 1,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 0, 0);
g_object_set_data(G_OBJECT(combo_box), COLOR_SAMPLE_KEY, color_sample);
g_object_set_data(G_OBJECT(colorsel), COLOR_SAMPLE_KEY, color_sample);
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index 66274d0847..e1b87a0a0f 100644
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -618,7 +618,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
if (args->to_file)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dest_cb), TRUE);
gtk_widget_set_tooltip_text(dest_cb, "Output to file instead of printer");
- ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), dest_cb, 0, 0, 1, 1, 0, 0, 0, 0);
+ ws_gtk_grid_attach(GTK_GRID(printer_grid), dest_cb, 0, 0, 1, 1);
if(action == output_action_print)
gtk_widget_show(dest_cb);
@@ -627,7 +627,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
g_object_set_data(G_OBJECT(dest_cb), PRINT_FILE_TE_KEY, file_te);
gtk_widget_set_tooltip_text(file_te, "Enter Output filename");
gtk_entry_set_text(GTK_ENTRY(file_te), args->file);
- ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), file_te, 1, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), file_te, 1, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0);
gtk_widget_set_sensitive(file_te, args->to_file);
gtk_widget_show(file_te);
if (args->to_file)
@@ -638,7 +638,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
g_object_set_data(G_OBJECT(dest_cb), PRINT_FILE_BT_KEY, file_bt);
g_object_set_data(G_OBJECT(file_bt), PRINT_TE_PTR_KEY, file_te);
gtk_widget_set_tooltip_text(file_bt, "Browse output filename in filesystem");
- ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), file_bt, 2, 0, 1, 1, 0, 0, 0, 0);
+ ws_gtk_grid_attach(GTK_GRID(printer_grid), file_bt, 2, 0, 1, 1);
gtk_widget_set_sensitive(file_bt, args->to_file);
gtk_widget_show(file_bt);
@@ -647,7 +647,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
cmd_lb = gtk_label_new("Print command:");
g_object_set_data(G_OBJECT(dest_cb), PRINT_CMD_LB_KEY, cmd_lb);
gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0f, 0.5f);
- ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), cmd_lb, 0, 1, 1, 1, 0, 0, 0, 0);
+ ws_gtk_grid_attach(GTK_GRID(printer_grid), cmd_lb, 0, 1, 1, 1);
gtk_widget_set_sensitive(cmd_lb, !args->to_file);
if(action == output_action_print)
gtk_widget_show(cmd_lb);
@@ -656,7 +656,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
g_object_set_data(G_OBJECT(dest_cb), PRINT_CMD_TE_KEY, cmd_te);
gtk_widget_set_tooltip_text(cmd_te, "Enter print command");
gtk_entry_set_text(GTK_ENTRY(cmd_te), args->cmd);
- ws_gtk_grid_attach_extended(GTK_GRID(printer_grid), cmd_te, 1, 1, 1, 1, 0, 0, 0, 0);
+ ws_gtk_grid_attach(GTK_GRID(printer_grid), cmd_te, 1, 1, 1, 1);
gtk_widget_set_sensitive(cmd_te, !args->to_file);
if(action == output_action_print)
gtk_widget_show(cmd_te);
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index bb7f186e4e..9d4d1cea8d 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -1507,7 +1507,7 @@ quit(GtkWidget *widget _U_, user_data_t *user_data)
static gboolean
draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data)
{
- user_data_t *user_data = data;
+ user_data_t *user_data = (user_data_t *)data;
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index d813f4c6fb..f9079fa028 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -797,7 +797,7 @@ on_configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer use
static gboolean
on_draw_area_draw_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
{
- sctp_graph_t *ios = user_data;
+ sctp_graph_t *ios = (sctp_graph_t *)user_data;
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index cd624092cc..e61aae5968 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -1185,7 +1185,7 @@ configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer user_d
static gboolean
draw_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
{
- sctp_graph_t *ios = user_data;
+ sctp_graph_t *ios = (sctp_graph_t *)user_data;
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index 693b2d6f8b..08b65382f2 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -1134,13 +1134,13 @@ static GtkWidget *control_panel_create_zoom_group(struct graph *g)
zoom_grid = ws_gtk_grid_new();
ws_gtk_grid_attach_extended(GTK_GRID(zoom_grid), zoom_h_label, 0, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_grid), zoom_h_entry, 1, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_grid), zoom_v_label, 0, 1, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_grid), zoom_v_entry, 1, 1, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
zoom_separator2 = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
@@ -1167,17 +1167,17 @@ static GtkWidget *control_panel_create_zoom_group(struct graph *g)
zoom_step_grid = ws_gtk_grid_new();
ws_gtk_grid_attach_extended(GTK_GRID(zoom_step_grid), zoom_h_step_label, 0, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_step_grid), zoom_h_step, 1, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_step_grid), zoom_v_step_label, 0, 1, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_step_grid), zoom_v_step, 1, 1, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_step_grid), zoom_same_toggle, 0, 2, 2, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(zoom_step_grid), zoom_ratio_toggle, 0, 3, 2, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
zoom_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_box_pack_start(GTK_BOX(zoom_box), zoom_inout_box, TRUE, TRUE, 0);
@@ -1308,21 +1308,21 @@ static GtkWidget *control_panel_create_magnify_group(struct graph *g)
mag_wh_grid = ws_gtk_grid_new();
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_width_label, 0, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_width, 1, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_height_label, 0, 1, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_height, 1, 1, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_x_label, 0, 2, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_x, 1, 2, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_y_label, 0, 3, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_wh_grid), mag_y, 1, 3, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 5, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 5, 0);
mag_h_zoom_label = gtk_label_new("Horizontal:");
mag_h_zoom_adj = (GtkAdjustment *)gtk_adjustment_new(10.0, 1.0, 25.0, (gfloat)0.1, 1, 0);
@@ -1337,17 +1337,17 @@ static GtkWidget *control_panel_create_magnify_group(struct graph *g)
mag_zoom_grid = ws_gtk_grid_new();
ws_gtk_grid_attach_extended(GTK_GRID(mag_zoom_grid), mag_h_zoom_label, 0, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 0, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_zoom_grid), mag_h_zoom, 1, 0, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 0, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_zoom_grid), mag_v_zoom_label, 0, 1 , 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 0, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_zoom_grid), mag_v_zoom, 1, 1, 1, 1,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 0, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_zoom_grid), mag_zoom_same, 0, 2, 2, 1,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 0, 0);
ws_gtk_grid_attach_extended(GTK_GRID(mag_zoom_grid), mag_zoom_ratio, 0, 3, 2, 1,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ (GtkAttachOptions)(GTK_FILL|GTK_EXPAND), (GtkAttachOptions)0, 0, 0);
mag_zoom_frame = gtk_frame_new("Magnify zoom");
gtk_container_add(GTK_CONTAINER(mag_zoom_frame), mag_zoom_grid);
@@ -3206,7 +3206,7 @@ static gboolean configure_event(GtkWidget *widget _U_, GdkEventConfigure *event,
static gboolean
draw_event(GtkWidget *widget _U_, cairo_t *cr, gpointer user_data)
{
- struct graph *g = user_data;
+ struct graph *g = (struct graph *)user_data;
debug(DBS_FENTRY) puts("draw_event()");
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 15:17:00 +0000