replace WIDGET_SET_SIZE with gtk_widget_set_size_request
svn path=/trunk/; revision=24910
This commit is contained in:
parent
a471e1af90
commit
c6d13dc2c8
|
@ -399,7 +399,7 @@ preview_new(void)
|
|||
row = 0;
|
||||
|
||||
label = add_string_to_table(table, &row, "Filename:", "-");
|
||||
WIDGET_SET_SIZE(label, DEF_WIDTH/3, -1);
|
||||
gtk_widget_set_size_request(label, DEF_WIDTH/3, -1);
|
||||
g_object_set_data(G_OBJECT(table), PREVIEW_FILENAME_KEY, label);
|
||||
label = add_string_to_table(table, &row, "Format:", "-");
|
||||
g_object_set_data(G_OBJECT(table), PREVIEW_FORMAT_KEY, label);
|
||||
|
@ -453,7 +453,7 @@ file_open_cmd(GtkWidget *w)
|
|||
#if GTK_CHECK_VERSION(2,4,0)
|
||||
/* it's annoying, that the file chooser dialog is already shown here,
|
||||
so we cannot use the correct gtk_window_set_default_size() to resize it */
|
||||
WIDGET_SET_SIZE(GTK_WINDOW(file_open_w), DEF_WIDTH, DEF_HEIGHT);
|
||||
gtk_widget_set_size_request(file_open_w, DEF_WIDTH, DEF_HEIGHT);
|
||||
#else
|
||||
gtk_window_set_default_size(GTK_WINDOW(file_open_w), DEF_WIDTH, DEF_HEIGHT);
|
||||
#endif
|
||||
|
@ -791,7 +791,7 @@ file_merge_cmd(GtkWidget *w)
|
|||
#if GTK_CHECK_VERSION(2,4,0)
|
||||
/* it's annoying, that the file chooser dialog is already shown here,
|
||||
so we cannot use the correct gtk_window_set_default_size() to resize it */
|
||||
WIDGET_SET_SIZE(GTK_WINDOW(file_merge_w), DEF_WIDTH, DEF_HEIGHT);
|
||||
gtk_widget_set_size_request(file_merge_w, DEF_WIDTH, DEF_HEIGHT);
|
||||
#else
|
||||
gtk_window_set_default_size(GTK_WINDOW(file_merge_w), DEF_WIDTH, DEF_HEIGHT);
|
||||
#endif
|
||||
|
|
|
@ -856,7 +856,7 @@ add_meter_to_table(GtkWidget *list, guint *row, gchar *title,
|
|||
0 /* padding */);
|
||||
|
||||
val_lb = gtk_label_new(value_title);
|
||||
WIDGET_SET_SIZE(val_lb, 50, -1);
|
||||
gtk_widget_set_size_request(val_lb, 50, -1);
|
||||
gtk_misc_set_alignment(GTK_MISC(val_lb), 1.0, 0.5);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX(main_hb),
|
||||
|
|
|
@ -212,7 +212,7 @@ const gchar *iface)
|
|||
/* downsize the default size of this progress bar in x direction (def:150), */
|
||||
/* otherwise it will become too large and the dialog will look ugly */
|
||||
/* XXX: use a TreeView instead of a table in order to fix this */
|
||||
WIDGET_SET_SIZE(info->counts[i].percent_pb, 70, -1);
|
||||
gtk_widget_set_size_request(info->counts[i].percent_pb, 70, -1);
|
||||
}
|
||||
|
||||
info->counts[i].percent_lb = gtk_label_new("0.0%");
|
||||
|
|
|
@ -43,12 +43,6 @@ g_signal_connect(G_OBJECT(widget), name, G_CALLBACK(callback), \
|
|||
#define SIGNAL_DISCONNECT_BY_FUNC(object, func, data) \
|
||||
g_signal_handlers_disconnect_by_func(G_OBJECT(object), func, data)
|
||||
|
||||
/* WIDGET_SET_SIZE would better be named WIDGET_SET_MIN_SIZE. */
|
||||
/* don't use WIDGET_SET_SIZE() to set the size of a dialog, */
|
||||
/* use gtk_window_set_default_size() for that purpose! */
|
||||
#define WIDGET_SET_SIZE(widget, width, height) \
|
||||
gtk_widget_set_size_request(GTK_WIDGET(widget), width, height)
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
#define WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES "_Interfaces"
|
||||
#define WIRESHARK_STOCK_LABEL_CAPTURE_AIRPCAP "_Wireless"
|
||||
|
|
|
@ -968,7 +968,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
|
|||
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_scrolled_win),
|
||||
GTK_SHADOW_IN);
|
||||
gtk_box_pack_start(GTK_BOX(field_vb), tree_scrolled_win, TRUE, TRUE, 0);
|
||||
WIDGET_SET_SIZE(tree_scrolled_win, 300, -1);
|
||||
gtk_widget_set_size_request(tree_scrolled_win, 300, -1);
|
||||
|
||||
|
||||
store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
|
||||
|
|
|
@ -228,7 +228,7 @@ fileset_dlg_add_file(fileset_entry *entry) {
|
|||
GtkRequisition requisition;
|
||||
|
||||
gtk_widget_size_request(fs_tb, &requisition);
|
||||
WIDGET_SET_SIZE(GTK_WINDOW(fs_sw), -1, requisition.height);
|
||||
gtk_widget_set_size_request(fs_sw, -1, requisition.height);
|
||||
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(fs_sw), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
|
||||
}
|
||||
|
||||
|
|
|
@ -1357,14 +1357,14 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
|
|||
|
||||
/* create "time" draw area */
|
||||
user_data->dlg.draw_area_time=gtk_drawing_area_new();
|
||||
WIDGET_SET_SIZE(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.pixmap_height);
|
||||
g_object_set_data(G_OBJECT(user_data->dlg.draw_area_time), "graph_analysis_data_t", user_data);
|
||||
|
||||
/* create "comments" draw area */
|
||||
user_data->dlg.draw_area_comments=gtk_drawing_area_new();
|
||||
WIDGET_SET_SIZE(user_data->dlg.draw_area_comments, COMMENT_WIDTH, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.draw_area_comments, COMMENT_WIDTH, user_data->dlg.pixmap_height);
|
||||
scroll_window_comments=gtk_scrolled_window_new(NULL, NULL);
|
||||
WIDGET_SET_SIZE(scroll_window_comments, COMMENT_WIDTH/2, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(scroll_window_comments, COMMENT_WIDTH/2, user_data->dlg.pixmap_height);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window_comments), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
|
||||
viewport_comments = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)), gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)));
|
||||
gtk_container_add(GTK_CONTAINER(viewport_comments), user_data->dlg.draw_area_comments);
|
||||
|
@ -1380,12 +1380,12 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
|
|||
user_data->dlg.pixmap_width = 2 * NODE_WIDTH;
|
||||
else
|
||||
user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
|
||||
WIDGET_SET_SIZE(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
|
||||
user_data->dlg.scroll_window=gtk_scrolled_window_new(NULL, NULL);
|
||||
if ( user_data->num_nodes < 6)
|
||||
WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
|
||||
else
|
||||
WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
|
||||
viewport = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)), gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)));
|
||||
gtk_container_add(GTK_CONTAINER(viewport), user_data->dlg.draw_area);
|
||||
|
@ -1601,11 +1601,11 @@ void graph_analysis_update(graph_analysis_data_t* user_data)
|
|||
get_nodes(user_data);
|
||||
|
||||
user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
|
||||
WIDGET_SET_SIZE(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
|
||||
if ( user_data->num_nodes < 6)
|
||||
WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
|
||||
else
|
||||
WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
|
||||
|
||||
/* redraw the graph */
|
||||
dialog_graph_redraw(user_data);
|
||||
|
@ -1622,11 +1622,11 @@ void graph_analysis_redraw(graph_analysis_data_t* user_data)
|
|||
get_nodes(user_data);
|
||||
|
||||
user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
|
||||
WIDGET_SET_SIZE(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
|
||||
if ( user_data->num_nodes < 6)
|
||||
WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
|
||||
else
|
||||
WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
|
||||
|
||||
|
||||
/* redraw the graph */
|
||||
|
|
|
@ -339,7 +339,7 @@ window_set_geometry(GtkWidget *widget, window_geometry_t *geom)
|
|||
|
||||
if (geom->set_size) {
|
||||
gtk_window_resize(GTK_WINDOW(widget),
|
||||
/*WIDGET_SET_SIZE(widget,*/
|
||||
/*gtk_widget_set_size_request(widget,*/
|
||||
geom->width,
|
||||
geom->height);
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
* If you want to save size and position, be sure to call window_destroy() instead of only
|
||||
* gtk_widget_destroy(), so you will probably have to SIGNAL_CONNECT to the "delete_event"!
|
||||
*
|
||||
* Don't use WIDGET_SET_SIZE() to set the size of a window,
|
||||
* Don't use gtk_widget_set_size_request() to set the size of a window,
|
||||
* use gtk_window_set_default_size() for that purpose!
|
||||
*
|
||||
* Be sure to call window_present() / window_destroy() appropriately, if you
|
||||
|
|
|
@ -1378,7 +1378,7 @@ create_draw_area(io_stat_t *io, GtkWidget *box)
|
|||
SIGNAL_CONNECT(io->draw_area, "destroy", quit, io);
|
||||
g_object_set_data(G_OBJECT(io->draw_area), "io_stat_t", io);
|
||||
|
||||
WIDGET_SET_SIZE(io->draw_area, io->pixmap_width, io->pixmap_height);
|
||||
gtk_widget_set_size_request(io->draw_area, io->pixmap_width, io->pixmap_height);
|
||||
|
||||
/* signals needed to handle backing pixmap */
|
||||
SIGNAL_CONNECT(io->draw_area, "expose_event", expose_event, NULL);
|
||||
|
|
20
gtk/main.c
20
gtk/main.c
|
@ -3966,12 +3966,12 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
|
||||
/* Packet list */
|
||||
pkt_scrollw = packet_list_new(prefs);
|
||||
WIDGET_SET_SIZE(packet_list, -1, pl_size);
|
||||
gtk_widget_set_size_request(packet_list, -1, pl_size);
|
||||
gtk_widget_show(pkt_scrollw);
|
||||
|
||||
/* Tree view */
|
||||
tv_scrollw = main_tree_view_new(prefs, &tree_view);
|
||||
WIDGET_SET_SIZE(tv_scrollw, -1, tv_size);
|
||||
gtk_widget_set_size_request(tv_scrollw, -1, tv_size);
|
||||
gtk_widget_show(tv_scrollw);
|
||||
|
||||
SIGNAL_CONNECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)),
|
||||
|
@ -3982,7 +3982,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
|
||||
/* Byte view. */
|
||||
byte_nb_ptr = byte_view_new();
|
||||
WIDGET_SET_SIZE(byte_nb_ptr, -1, bv_size);
|
||||
gtk_widget_set_size_request(byte_nb_ptr, -1, bv_size);
|
||||
gtk_widget_show(byte_nb_ptr);
|
||||
|
||||
SIGNAL_CONNECT(byte_nb_ptr, "button_press_event", popup_menu_handler,
|
||||
|
@ -4030,7 +4030,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
"Current 802.11 Channel", "Private");
|
||||
gtk_widget_show(channel_lb);
|
||||
|
||||
WIDGET_SET_SIZE(channel_lb, 85, 28);
|
||||
gtk_widget_set_size_request(channel_lb, 85, 28);
|
||||
|
||||
/* Create the channel combo box */
|
||||
channel_cm = gtk_combo_new();
|
||||
|
@ -4049,7 +4049,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
gtk_tooltips_set_tip(airpcap_tooltips, GTK_WIDGET(GTK_COMBO(channel_cm)->entry),
|
||||
"Change the 802.11 RF channel", NULL);
|
||||
|
||||
WIDGET_SET_SIZE(channel_cm, 120, 28);
|
||||
gtk_widget_set_size_request(channel_cm, 120, 28);
|
||||
|
||||
if(airpcap_if_active != NULL) {
|
||||
chan_str = ieee80211_mhz_to_str(airpcap_if_active->channelInfo.Frequency);
|
||||
|
@ -4073,7 +4073,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
"Current 802.11 Channel Offset", "Private");
|
||||
gtk_widget_show(channel_offset_lb);
|
||||
|
||||
WIDGET_SET_SIZE(channel_offset_lb, 80, 28);
|
||||
gtk_widget_set_size_request(channel_offset_lb, 80, 28);
|
||||
|
||||
/* Start: Channel offset combo box */
|
||||
channel_offset_cb = gtk_combo_new();
|
||||
|
@ -4090,7 +4090,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
gtk_tooltips_set_tip(airpcap_tooltips, GTK_WIDGET(GTK_COMBO(channel_offset_cb)->entry),
|
||||
"Change channel offset", NULL);
|
||||
|
||||
WIDGET_SET_SIZE(channel_offset_cb, 50, 28);
|
||||
gtk_widget_set_size_request(channel_offset_cb, 50, 28);
|
||||
|
||||
gtk_widget_show(channel_offset_cb);
|
||||
|
||||
|
@ -4119,7 +4119,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
gtk_toolbar_append_widget(GTK_TOOLBAR(airpcap_tb), wrong_crc_cm,
|
||||
"", "Private");
|
||||
|
||||
WIDGET_SET_SIZE(wrong_crc_cm, 100, -1);
|
||||
gtk_widget_set_size_request(wrong_crc_cm, 100, -1);
|
||||
|
||||
linktype_list = g_list_append(linktype_list, AIRPCAP_VALIDATION_TYPE_NAME_ALL);
|
||||
linktype_list = g_list_append(linktype_list, AIRPCAP_VALIDATION_TYPE_NAME_CORRECT);
|
||||
|
@ -4152,7 +4152,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
enable_decryption_cb = gtk_combo_new ();
|
||||
gtk_widget_set_name (enable_decryption_cb, "enable_decryption_cb");
|
||||
gtk_widget_show (enable_decryption_cb);
|
||||
WIDGET_SET_SIZE (enable_decryption_cb, 83, -1);
|
||||
gtk_widget_set_size_request(enable_decryption_cb, 83, -1);
|
||||
update_decryption_mode_list(enable_decryption_cb);
|
||||
|
||||
enable_decryption_en = GTK_COMBO (enable_decryption_cb)->entry;
|
||||
|
@ -4237,7 +4237,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
|
|||
g_object_set_data(G_OBJECT(top_level), E_DFILTER_CM_KEY, filter_cm);
|
||||
SIGNAL_CONNECT(filter_te, "activate", filter_activate_cb, filter_te);
|
||||
SIGNAL_CONNECT(filter_te, "changed", filter_te_syntax_check_cb, NULL);
|
||||
WIDGET_SET_SIZE(filter_cm, 400, -1);
|
||||
gtk_widget_set_size_request(filter_cm, 400, -1);
|
||||
gtk_widget_show(filter_cm);
|
||||
gtk_toolbar_append_widget(GTK_TOOLBAR(filter_tb), filter_cm,
|
||||
NULL, NULL);
|
||||
|
|
|
@ -52,7 +52,7 @@ welcome_item(const gchar *stock_item, const gchar * label, const gchar * message
|
|||
item_hb = gtk_hbox_new(FALSE, 1);
|
||||
|
||||
w = gtk_button_new_from_stock(stock_item);
|
||||
WIDGET_SET_SIZE(w, 80, 40);
|
||||
gtk_widget_set_size_request(w, 80, 40);
|
||||
gtk_button_set_label(GTK_BUTTON(w), label);
|
||||
gtk_tooltips_set_tip(tooltips, w, tooltip, NULL);
|
||||
gtk_box_pack_start(GTK_BOX(item_hb), w, FALSE, FALSE, 0);
|
||||
|
|
|
@ -144,14 +144,14 @@ void new_window_cb(GtkWidget *w _U_)
|
|||
/* Tree view */
|
||||
tv_scrollw = main_tree_view_new(&prefs, &tree_view);
|
||||
gtk_paned_pack1(GTK_PANED(pane), tv_scrollw, TRUE, TRUE);
|
||||
WIDGET_SET_SIZE(tv_scrollw, -1, tv_size);
|
||||
gtk_widget_set_size_request(tv_scrollw, -1, tv_size);
|
||||
gtk_widget_show(tv_scrollw);
|
||||
gtk_widget_show(tree_view);
|
||||
|
||||
/* Byte view */
|
||||
bv_nb_ptr = byte_view_new();
|
||||
gtk_paned_pack2(GTK_PANED(pane), bv_nb_ptr, FALSE, FALSE);
|
||||
WIDGET_SET_SIZE(bv_nb_ptr, -1, bv_size);
|
||||
gtk_widget_set_size_request(bv_nb_ptr, -1, bv_size);
|
||||
gtk_widget_show(bv_nb_ptr);
|
||||
|
||||
DataPtr->main = main_w;
|
||||
|
|
|
@ -432,7 +432,7 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
|
|||
/* Fill in the data. */
|
||||
fill_in_tree(tree, ps);
|
||||
|
||||
WIDGET_SET_SIZE(tree, DEF_DLG_WIDTH, MAX_DLG_HEIGHT);
|
||||
gtk_widget_set_size_request(tree, DEF_DLG_WIDTH, MAX_DLG_HEIGHT);
|
||||
gtk_tree_view_expand_all(tree_view);
|
||||
|
||||
proto_hier_create_popup_menu ();
|
||||
|
|
|
@ -1435,7 +1435,7 @@ static void create_draw_area(user_data_t* user_data, GtkWidget *box)
|
|||
SIGNAL_CONNECT(user_data->dlg.dialog_graph.draw_area, "destroy", quit, user_data);
|
||||
g_object_set_data(G_OBJECT(user_data->dlg.dialog_graph.draw_area), "user_data_t", user_data);
|
||||
|
||||
WIDGET_SET_SIZE(user_data->dlg.dialog_graph.draw_area, user_data->dlg.dialog_graph.pixmap_width, user_data->dlg.dialog_graph.pixmap_height);
|
||||
gtk_widget_set_size_request(user_data->dlg.dialog_graph.draw_area, user_data->dlg.dialog_graph.pixmap_width, user_data->dlg.dialog_graph.pixmap_height);
|
||||
|
||||
/* signals needed to handle backing pixmap */
|
||||
SIGNAL_CONNECT(user_data->dlg.dialog_graph.draw_area, "expose_event", expose_event, NULL);
|
||||
|
|
|
@ -1723,7 +1723,7 @@ decode_streams(void)
|
|||
reset_channels();
|
||||
|
||||
progress_bar = gtk_progress_bar_new();
|
||||
WIDGET_SET_SIZE(progress_bar, 100, -1);
|
||||
gtk_widget_set_size_request(progress_bar, 100, -1);
|
||||
gtk_box_pack_start(GTK_BOX (stat_hbox), progress_bar, FALSE, FALSE, 2);
|
||||
gtk_widget_show(progress_bar);
|
||||
statusbar_context = gtk_statusbar_get_context_id((GtkStatusbar *) info_bar, "main");
|
||||
|
@ -1764,7 +1764,7 @@ decode_streams(void)
|
|||
if (prefs.rtp_player_max_visible < 1 || prefs.rtp_player_max_visible > 10)
|
||||
prefs.rtp_player_max_visible = RTP_PLAYER_DEFAULT_VISIBLE;
|
||||
|
||||
WIDGET_SET_SIZE(main_scrolled_window, CHANNEL_WIDTH,
|
||||
gtk_widget_set_size_request(main_scrolled_window, CHANNEL_WIDTH,
|
||||
min(counter, prefs.rtp_player_max_visible) * (CHANNEL_HEIGHT+60));
|
||||
|
||||
gtk_widget_show_all(main_scrolled_window);
|
||||
|
@ -1872,7 +1872,7 @@ rtp_player_dlg_create(void)
|
|||
|
||||
main_scrolled_window=gtk_scrolled_window_new(NULL, NULL);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_scrolled_window), 4);
|
||||
WIDGET_SET_SIZE(main_scrolled_window, CHANNEL_WIDTH, 0);
|
||||
gtk_widget_set_size_request(main_scrolled_window, CHANNEL_WIDTH, 0);
|
||||
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (main_scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||
gtk_container_add(GTK_CONTAINER(main_vb), main_scrolled_window);
|
||||
|
|
|
@ -571,7 +571,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
|
|||
gtk_container_add(GTK_CONTAINER(u_data->analyse_nb->page2->addr_frame), addr_hb);
|
||||
|
||||
u_data->analyse_nb->page2->scrolled_window = scrolled_window_new(NULL, NULL);
|
||||
WIDGET_SET_SIZE(u_data->analyse_nb->page2->scrolled_window, 560, 100);
|
||||
gtk_widget_set_size_request(u_data->analyse_nb->page2->scrolled_window, 560, 100);
|
||||
|
||||
u_data->analyse_nb->page2->clist = gtk_clist_new(1);
|
||||
gtk_widget_show(u_data->analyse_nb->page2->clist);
|
||||
|
@ -682,7 +682,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
|
|||
gtk_container_add(GTK_CONTAINER(u_data->analyse_nb->page3->addr_frame), addr_hb);
|
||||
|
||||
u_data->analyse_nb->page3->scrolled_window = scrolled_window_new(NULL, NULL);
|
||||
WIDGET_SET_SIZE(u_data->analyse_nb->page3->scrolled_window, 560, 100);
|
||||
gtk_widget_set_size_request(u_data->analyse_nb->page3->scrolled_window, 560, 100);
|
||||
|
||||
u_data->analyse_nb->page3->clist = gtk_clist_new(1);
|
||||
gtk_widget_show(u_data->analyse_nb->page3->clist);
|
||||
|
|
|
@ -1187,7 +1187,7 @@ static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data)
|
|||
SIGNAL_CONNECT(u_data->io->draw_area, "destroy", quit, u_data);
|
||||
g_object_set_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t", u_data->io);
|
||||
|
||||
WIDGET_SET_SIZE(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height);
|
||||
gtk_widget_set_size_request(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height);
|
||||
|
||||
/* signals needed to handle backing pixmap */
|
||||
SIGNAL_CONNECT(u_data->io->draw_area, "expose_event", expose_event, NULL);
|
||||
|
|
|
@ -242,7 +242,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction)
|
|||
clist = gtk_clist_new (NUM_COLS);
|
||||
gtk_widget_show (clist);
|
||||
gtk_container_add (GTK_CONTAINER (scrolledwindow1), clist);
|
||||
WIDGET_SET_SIZE(clist, 850, 200);
|
||||
gtk_widget_set_size_request(clist, 850, 200);
|
||||
|
||||
gtk_clist_set_column_width (GTK_CLIST (clist), 0, 135);
|
||||
gtk_clist_set_column_width (GTK_CLIST (clist), 1, 35);
|
||||
|
@ -354,7 +354,7 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data)
|
|||
u_data->io=io;
|
||||
u_data->io->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
||||
gtk_window_set_position (GTK_WINDOW (u_data->io->window), GTK_WIN_POS_CENTER);
|
||||
WIDGET_SET_SIZE(u_data->io->window, 500, 400);
|
||||
gtk_widget_set_size_request(u_data->io->window, 500, 400);
|
||||
SIGNAL_CONNECT(u_data->io->window, "destroy", on_destroy,u_data);
|
||||
|
||||
/* Container for each row of widgets */
|
||||
|
|
|
@ -169,7 +169,7 @@ gtk_sctperror_dlg(void)
|
|||
clist = gtk_clist_new (NUM_COLS);
|
||||
gtk_widget_show (clist);
|
||||
gtk_container_add (GTK_CONTAINER (scrolledwindow1), clist);
|
||||
WIDGET_SET_SIZE(clist, 500, 200);
|
||||
gtk_widget_set_size_request(clist, 500, 200);
|
||||
|
||||
gtk_clist_set_column_width (GTK_CLIST (clist), 0, 100);
|
||||
gtk_clist_set_column_width (GTK_CLIST (clist), 1, 200);
|
||||
|
|
|
@ -1263,7 +1263,7 @@ static void create_draw_area(GtkWidget *box, struct sctp_udata *u_data)
|
|||
SIGNAL_CONNECT(u_data->io->draw_area, "destroy", quit, u_data);
|
||||
g_object_set_data(G_OBJECT(u_data->io->draw_area), "sctp_graph_t", u_data->io);
|
||||
|
||||
WIDGET_SET_SIZE(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height);
|
||||
gtk_widget_set_size_request(u_data->io->draw_area, u_data->io->pixmap_width, u_data->io->pixmap_height);
|
||||
|
||||
/* signals needed to handle backing pixmap */
|
||||
SIGNAL_CONNECT(u_data->io->draw_area, "expose_event", expose_event, NULL);
|
||||
|
|
|
@ -499,7 +499,7 @@ gtk_sctpstat_dlg(void)
|
|||
clist = gtk_clist_new (NUM_COLS);
|
||||
gtk_widget_show (clist);
|
||||
gtk_container_add (GTK_CONTAINER (scrolledwindow1), clist);
|
||||
WIDGET_SET_SIZE(clist, 650, 200);
|
||||
gtk_widget_set_size_request(clist, 650, 200);
|
||||
|
||||
gtk_clist_set_column_width (GTK_CLIST (clist), 0, 50);
|
||||
gtk_clist_set_column_width (GTK_CLIST (clist), 1, 50);
|
||||
|
|
|
@ -119,7 +119,7 @@ stream_prefs_show()
|
|||
layout = gtk_widget_create_pango_layout(sample, SAMPLE_SERVER_TEXT);
|
||||
pango_layout_get_pixel_size(layout, &width, &height);
|
||||
g_object_unref(G_OBJECT(layout));
|
||||
WIDGET_SET_SIZE(sample, width, height * 2);
|
||||
gtk_widget_set_size_request(sample, width, height * 2);
|
||||
gtk_text_view_set_editable(GTK_TEXT_VIEW(sample), FALSE);
|
||||
buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(sample));
|
||||
gtk_text_buffer_get_start_iter(buf, &iter);
|
||||
|
|
|
@ -537,7 +537,7 @@ static void create_text_widget (struct graph *g)
|
|||
debug(DBS_FENTRY) puts ("create_text_widget()");
|
||||
streamwindow = dlg_window_new ("Wireshark: Packet chain");
|
||||
gtk_widget_set_name (streamwindow, "Packet chain");
|
||||
WIDGET_SET_SIZE(streamwindow, TXT_WIDTH, TXT_HEIGHT);
|
||||
gtk_widget_set_size_request(streamwindow, TXT_WIDTH, TXT_HEIGHT);
|
||||
gtk_container_border_width (GTK_CONTAINER(streamwindow), 2);
|
||||
|
||||
box = gtk_vbox_new (FALSE, 0);
|
||||
|
|
Loading…
Reference in New Issue