diff options
| -rw-r--r-- | gtk/main.c | 7 | ||||
| -rw-r--r-- | gtk/packet_win.c | 7 | ||||
| -rw-r--r-- | gtk/proto_draw.c | 12 | ||||
| -rw-r--r-- | gtk/proto_draw.h | 6 |
4 files changed, 15 insertions, 17 deletions
diff --git a/gtk/main.c b/gtk/main.c index 5814a32ee6..454c6f2703 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.243 2002/03/12 10:37:04 guy Exp $ + * $Id: main.c,v 1.244 2002/03/31 23:11:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2272,8 +2272,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) item_style = gtk_style_new(); gdk_font_unref(item_style->font); item_style->font = m_r_font; - create_tree_view(tv_size, prefs, l_pane, &tv_scrollw, &tree_view, - prefs->gui_scrollbar_on_right); + create_tree_view(tv_size, prefs, l_pane, &tv_scrollw, &tree_view); gtk_signal_connect(GTK_OBJECT(tree_view), "tree-select-row", GTK_SIGNAL_FUNC(tree_view_select_row_cb), NULL); gtk_signal_connect(GTK_OBJECT(tree_view), "tree-unselect-row", @@ -2284,7 +2283,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_widget_show(tree_view); /* Byte view. */ - byte_nb_ptr = create_byte_view(bv_size, l_pane, prefs->gui_scrollbar_on_right); + byte_nb_ptr = create_byte_view(bv_size, l_pane); gtk_signal_connect(GTK_OBJECT(byte_nb_ptr), "button_press_event", GTK_SIGNAL_FUNC(popup_menu_handler), diff --git a/gtk/packet_win.c b/gtk/packet_win.c index ae39b09b65..9414b83897 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -3,7 +3,7 @@ * * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet_win.c,v 1.35 2002/03/05 12:03:26 guy Exp $ + * $Id: packet_win.c,v 1.36 2002/03/31 23:11:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -150,12 +150,11 @@ create_new_window(char *Title, gint tv_size, gint bv_size) gtk_widget_show(pane); /* Tree view */ - create_tree_view(tv_size, &prefs, pane, &tv_scrollw, &tree_view, - prefs.gui_scrollbar_on_right); + create_tree_view(tv_size, &prefs, pane, &tv_scrollw, &tree_view); gtk_widget_show(tree_view); /* Byte view */ - bv_nb_ptr = create_byte_view(bv_size, pane, prefs.gui_scrollbar_on_right); + bv_nb_ptr = create_byte_view(bv_size, pane); /* Allocate data structure to represent this window. */ DataPtr = (struct PacketWinData *) g_malloc(sizeof(struct PacketWinData)); diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 03db94406d..88ba1866f6 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -1,7 +1,7 @@ /* proto_draw.c * Routines for GTK+ packet display * - * $Id: proto_draw.c,v 1.48 2002/03/05 12:03:27 guy Exp $ + * $Id: proto_draw.c,v 1.49 2002/03/31 23:11:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -140,7 +140,7 @@ redraw_hex_dump(GtkWidget *nb, frame_data *fd, field_info *finfo) const guint8 *data; guint len; - bv = get_notebook_bv_ptr(byte_nb_ptr); + bv = get_notebook_bv_ptr(nb); if (bv != NULL) { data = get_byte_view_data_and_length(bv, &len); if (data != NULL) @@ -205,7 +205,7 @@ byte_num(int offset, int start_point) * the item in the GUI proto_tree that corresponds to that byte, and * select it. */ static gint -byte_view_select(GtkWidget *widget, GdkEventButton *event, gpointer data) +byte_view_select(GtkWidget *widget, GdkEventButton *event) { proto_tree *tree; GtkCTree *ctree; @@ -334,7 +334,7 @@ byte_view_button_press_cb(GtkWidget *widget, GdkEvent *event, gpointer data) switch(event_button->button) { case 1: - return byte_view_select(widget, event_button, data); + return byte_view_select(widget, event_button); case 3: return popup_menu_handler(widget, event, data); default: @@ -346,7 +346,7 @@ byte_view_button_press_cb(GtkWidget *widget, GdkEvent *event, gpointer data) } GtkWidget * -create_byte_view(gint bv_size, GtkWidget *pane, int pos) +create_byte_view(gint bv_size, GtkWidget *pane) { GtkWidget *byte_nb; @@ -802,7 +802,7 @@ set_ptree_font_all(GdkFont *font) void create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane, - GtkWidget **tv_scrollw_p, GtkWidget **tree_view_p, int pos) + GtkWidget **tv_scrollw_p, GtkWidget **tree_view_p) { GtkWidget *tv_scrollw, *tree_view; diff --git a/gtk/proto_draw.h b/gtk/proto_draw.h index 54f4b2906a..cf6a91845d 100644 --- a/gtk/proto_draw.h +++ b/gtk/proto_draw.h @@ -1,7 +1,7 @@ /* proto_draw.h * Definitions for GTK+ packet display structures and routines * - * $Id: proto_draw.h,v 1.16 2002/02/18 01:08:44 guy Exp $ + * $Id: proto_draw.h,v 1.17 2002/03/31 23:11:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -47,7 +47,7 @@ extern void redraw_hex_dump(GtkWidget *nb, frame_data *fd, field_info *finfo); /* Redraw all byte view windows. */ extern void redraw_hex_dump_all(void); -extern GtkWidget *create_byte_view(gint bv_size, GtkWidget *pane, int pos); +extern GtkWidget *create_byte_view(gint bv_size, GtkWidget *pane); extern void add_byte_views(frame_data *frame, proto_tree *tree, GtkWidget *tree_view, GtkWidget *byte_nb_ptr); @@ -57,7 +57,7 @@ void packet_hex_print(GtkText *, const guint8 *, frame_data *, field_info *, void packet_hex_reprint(GtkText *); void create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane, - GtkWidget **tv_scrollw_p, GtkWidget **tree_view_p, int pos); + GtkWidget **tv_scrollw_p, GtkWidget **tree_view_p); void proto_tree_draw(proto_tree *protocol_tree, GtkWidget *tree_view); void expand_all_tree(proto_tree *protocol_tree, GtkWidget *tree_view); void collapse_all_tree(proto_tree *protocol_tree, GtkWidget *tree_view); |