aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/ansi_a_stat.c7
-rw-r--r--gtk/ansi_map_stat.c9
-rw-r--r--gtk/capture_prefs.c10
-rw-r--r--gtk/color_dlg.c8
-rw-r--r--gtk/column_prefs.c11
-rw-r--r--gtk/decode_as_dlg.c27
-rw-r--r--gtk/dfilter_expr_dlg.c37
-rw-r--r--gtk/endpoint_talkers_table.c6
-rw-r--r--gtk/filter_prefs.c11
-rw-r--r--gtk/follow_dlg.c9
-rw-r--r--gtk/gsm_a_stat.c7
-rw-r--r--gtk/gtk_stat_util.c5
-rw-r--r--gtk/h225_counter.c6
-rw-r--r--gtk/h225_ras_srt.c6
-rw-r--r--gtk/help_dlg.c16
-rw-r--r--gtk/isup_stat.c9
-rw-r--r--gtk/mgcp_stat.c6
-rw-r--r--gtk/packet_list.c10
-rw-r--r--gtk/plugins_dlg.c12
-rw-r--r--gtk/prefs_dlg.c6
-rw-r--r--gtk/proto_dlg.c8
-rw-r--r--gtk/proto_draw.c28
-rw-r--r--gtk/proto_hier_stats_dlg.c11
-rw-r--r--gtk/rtp_analysis.c10
-rw-r--r--gtk/rtp_stream_dlg.c4
-rw-r--r--gtk/service_response_time_table.c6
-rw-r--r--gtk/supported_protos_dlg.c18
-rw-r--r--gtk/tcp_graph.c14
-rw-r--r--gtk/ui_util.c5
29 files changed, 191 insertions, 131 deletions
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 1a1ff04710..b1993f6516 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_a_stat.c,v 1.10 2004/01/31 03:22:38 guy Exp $
+ * $Id: ansi_a_stat.c,v 1.11 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,6 +53,7 @@
#include "../globals.h"
#include "filter_prefs.h"
#include "compat_macros.h"
+#include "ui_util.h"
typedef struct column_arrows {
@@ -334,13 +335,11 @@ ansi_a_stat_gtk_win_create(
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+ dlg_p->scrolled_win = scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(vbox), dlg_p->scrolled_win, TRUE, TRUE, 0);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 00bfb54669..bababd4eee 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_map_stat.c,v 1.13 2004/01/31 03:22:39 guy Exp $
+ * $Id: ansi_map_stat.c,v 1.14 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,8 +51,9 @@
#include "../globals.h"
#include "filter_prefs.h"
#include "compat_macros.h"
-
#include "packet-ansi_map.h"
+#include "ui_util.h"
+
typedef struct column_arrows {
GtkWidget *table;
@@ -307,13 +308,11 @@ ansi_map_stat_gtk_win_create(
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+ dlg_p->scrolled_win = scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(vbox), dlg_p->scrolled_win, TRUE, TRUE, 0);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 13497c56ba..038b41c031 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -1,7 +1,7 @@
/* capture_prefs.c
* Dialog box for capture preferences
*
- * $Id: capture_prefs.c,v 1.28 2004/01/31 03:22:39 guy Exp $
+ * $Id: capture_prefs.c,v 1.29 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -254,9 +254,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
gtk_widget_show(cur_opts_fr);
/* create a scrolled window to pack the current options CList widget into */
- cur_scr_win = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(cur_scr_win),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ cur_scr_win = scrolled_window_new(NULL, NULL);
gtk_container_border_width(GTK_CONTAINER(cur_scr_win), 3);
gtk_container_add(GTK_CONTAINER(cur_opts_fr), cur_scr_win);
gtk_widget_show(cur_scr_win);
@@ -287,9 +285,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_)
gtk_widget_show(main_hb);
/* create a scrolled window to pack the interface CList widget into */
- if_scr_win = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(if_scr_win),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ if_scr_win = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(main_hb), if_scr_win, TRUE, TRUE, 0);
gtk_widget_show(if_scr_win);
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 6c3838f994..567749fd3a 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.39 2004/01/31 12:13:22 ulfl Exp $
+ * $Id: color_dlg.c,v 1.40 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -344,10 +344,10 @@ colorize_dialog_new (char *filter)
gtk_box_pack_start (GTK_BOX (list_vbox), list_label, FALSE, FALSE, 0);
/* create the list of filters */
- scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ scrolledwindow1 = scrolled_window_new(NULL, NULL);
#if GTK_MAJOR_VERSION >= 2
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow1),
+ GTK_SHADOW_IN);
#endif
gtk_widget_ref (scrolledwindow1);
OBJECT_SET_DATA_FULL(color_win, "scrolledwindow1", scrolledwindow1, gtk_widget_unref);
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index 128108b777..c1b0b95874 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,7 +1,7 @@
/* column_prefs.c
* Dialog box for column preferences
*
- * $Id: column_prefs.c,v 1.21 2004/01/25 12:10:27 ulfl Exp $
+ * $Id: column_prefs.c,v 1.22 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,6 +34,7 @@
#include "prefs.h"
#include "column.h"
#include "compat_macros.h"
+#include "ui_util.h"
#if GTK_MAJOR_VERSION >= 2
#include "ui_util.h"
@@ -144,9 +145,11 @@ column_prefs_show() {
gtk_widget_show (list_lb);
gtk_box_pack_start (GTK_BOX (list_vb), list_lb, FALSE, FALSE, 0);
- list_sc = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(list_sc),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ list_sc = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(list_sc),
+ GTK_SHADOW_IN);
+#endif
gtk_container_add(GTK_CONTAINER(list_vb), list_sc);
gtk_widget_show(list_sc);
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index adb1b8fe9c..8a81b61fbf 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
/* decode_as_dlg.c
*
- * $Id: decode_as_dlg.c,v 1.36 2004/01/31 03:22:39 guy Exp $
+ * $Id: decode_as_dlg.c,v 1.37 2004/02/06 19:19:09 ulfl Exp $
*
* Routines to modify dissector tables on the fly.
*
@@ -526,9 +526,14 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_)
#endif
/* Put clist into a scrolled window */
- scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ scrolled_window = scrolled_window_new(NULL, NULL);
+ /* this will result to set the width of the dialog to the required size */
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
+ GTK_SHADOW_IN);
+#endif
gtk_container_add(GTK_CONTAINER(scrolled_window),
GTK_WIDGET(list));
gtk_box_pack_start(GTK_BOX(main_vb), scrolled_window, TRUE, TRUE, 0);
@@ -1127,7 +1132,6 @@ static void
decode_list_menu_start(GtkWidget *page, GtkWidget **list_p,
GtkWidget **scrolled_win_p)
{
- GtkWidget *window;
#if GTK_MAJOR_VERSION < 2
gchar *titles[E_LIST_S_COLUMNS] = {"Short Name", "Table Name"};
GtkCList *list;
@@ -1167,16 +1171,21 @@ decode_list_menu_start(GtkWidget *page, GtkWidget **list_p,
g_object_set_data(G_OBJECT(page), E_PAGE_LIST, list);
#endif
- *scrolled_win_p = window = gtk_scrolled_window_new(NULL, NULL);
- /* Provide a minimum of a couple of rows worth of data */
- WIDGET_SET_SIZE(window, -1, E_DECODE_MIN_HEIGHT);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window),
+ *scrolled_win_p = scrolled_window_new(NULL, NULL);
+ /* this will result to set the width of the dialog to the required size */
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(*scrolled_win_p),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(*scrolled_win_p),
+ GTK_SHADOW_IN);
+#endif
+ /* Provide a minimum of a couple of rows worth of data */
+ WIDGET_SET_SIZE(*scrolled_win_p, -1, E_DECODE_MIN_HEIGHT);
#if GTK_MAJOR_VERSION < 2
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(window),
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(*scrolled_win_p),
GTK_WIDGET(list));
#else
- gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(list));
+ gtk_container_add(GTK_CONTAINER(*scrolled_win_p), GTK_WIDGET(list));
#endif
*list_p = GTK_WIDGET(list);
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index c4d935e92e..7c7e0410a1 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: dfilter_expr_dlg.c,v 1.49 2004/01/31 03:22:39 guy Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.50 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1093,7 +1093,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
GtkWidget *col1_vb;
GtkWidget *tree_label, *tree, *tree_scrolled_win;
GtkWidget *col2_vb;
- GtkWidget *relation_label, *relation_list;
+ GtkWidget *relation_label, *relation_list, *relation_list_scrolled_win;
GtkWidget *range_label, *range_entry;
GtkWidget *value_vb;
GtkWidget *value_label, *value_entry, *value_list_scrolled_win, *value_list;
@@ -1139,10 +1139,12 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
gtk_box_pack_start(GTK_BOX(col1_vb), tree_label, FALSE, FALSE, 0);
gtk_widget_show(tree_label);
- tree_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tree_scrolled_win),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ tree_scrolled_win = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_scrolled_win),
+ GTK_SHADOW_IN);
+#endif
+
WIDGET_SET_SIZE(tree_scrolled_win, 300, 400);
gtk_box_pack_start(GTK_BOX(col1_vb), tree_scrolled_win, FALSE, FALSE, 0);
gtk_widget_show(tree_scrolled_win);
@@ -1188,6 +1190,16 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
gtk_misc_set_alignment(GTK_MISC(relation_label), 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(col2_vb), relation_label, FALSE, FALSE, 0);
+ relation_list_scrolled_win = scrolled_window_new(NULL, NULL);
+ /* never use a scrollbar in x direction, show the complete relation string */
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(relation_list_scrolled_win),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(relation_list_scrolled_win),
+ GTK_SHADOW_IN);
+#endif
+ gtk_widget_show(relation_list_scrolled_win);
+
#if GTK_MAJOR_VERSION < 2
relation_list = gtk_list_new();
gtk_list_set_selection_mode(GTK_LIST(relation_list),
@@ -1204,7 +1216,13 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
l_sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(relation_list));
gtk_tree_selection_set_mode(l_sel, GTK_SELECTION_BROWSE);
#endif
- gtk_box_pack_start(GTK_BOX(col2_vb), relation_list, TRUE, TRUE, 0);
+#if GTK_MAJOR_VERSION < 2
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(relation_list_scrolled_win),
+ relation_list);
+#else
+ gtk_container_add(GTK_CONTAINER(relation_list_scrolled_win), relation_list);
+#endif
+ gtk_box_pack_start(GTK_BOX(col2_vb), relation_list_scrolled_win, TRUE, TRUE, 0);
range_label = gtk_label_new("Range (offset:length)");
gtk_misc_set_alignment(GTK_MISC(range_label), 0.0, 0.0);
@@ -1247,10 +1265,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
gtk_box_pack_start(GTK_BOX(value_vb), value_entry, FALSE, FALSE, 0);
gtk_widget_show(value_entry);
- value_list_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(value_list_scrolled_win),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ value_list_scrolled_win = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(value_vb), value_list_scrolled_win, TRUE,
TRUE, 0);
gtk_widget_show(value_list_scrolled_win);
diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index 9030803564..e0eac0acf2 100644
--- a/gtk/endpoint_talkers_table.c
+++ b/gtk/endpoint_talkers_table.c
@@ -4,7 +4,7 @@
* endpoint_talkers_table 2003 Ronnie Sahlberg
* Helper routines common to all endpoint talkers tap.
*
- * $Id: endpoint_talkers_table.c,v 1.29 2004/01/31 03:22:39 guy Exp $
+ * $Id: endpoint_talkers_table.c,v 1.30 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -48,6 +48,7 @@
#include "gtk/color_dlg.h"
#include "gtkglobals.h"
#include "main.h"
+#include "ui_util.h"
extern GtkWidget *main_display_filter_widget;
@@ -978,8 +979,7 @@ init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filt
gtk_widget_show(talkers->win);
- talkers->scrolled_window=gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(talkers->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ talkers->scrolled_window=scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(vbox), talkers->scrolled_window, TRUE, TRUE, 0);
talkers->table=(GtkCList *)gtk_clist_new(NUM_COLS);
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 8e859d5012..e2aeded3c4 100644
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
* (This used to be a notebook page under "Preferences", hence the
* "prefs" in the file name.)
*
- * $Id: filter_prefs.c,v 1.59 2004/01/31 03:22:40 guy Exp $
+ * $Id: filter_prefs.c,v 1.60 2004/02/06 19:19:09 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -422,9 +422,12 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
gtk_box_pack_start(GTK_BOX(top_hb), filter_fr, TRUE, TRUE, 0);
gtk_widget_show(filter_fr);
- filter_sc = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(filter_sc),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ filter_sc = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(filter_sc),
+ GTK_SHADOW_IN);
+#endif
+
WIDGET_SET_SIZE(filter_sc, 250, 150);
gtk_container_set_border_width (GTK_CONTAINER (filter_sc), 5);
gtk_container_add(GTK_CONTAINER(filter_fr), filter_sc);
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index 5f5c2cbb59..ed99c97e54 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.42 2004/01/31 03:22:40 guy Exp $
+ * $Id: follow_dlg.c,v 1.43 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -266,10 +266,11 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_)
/* create a scrolled window for the text */
txt_scrollw = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start(GTK_BOX(vbox), txt_scrollw, TRUE, TRUE, 0);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
/* create a text box */
#if GTK_MAJOR_VERSION < 2
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index ab778e5378..ebf343c383 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: gsm_a_stat.c,v 1.10 2004/01/31 03:22:40 guy Exp $
+ * $Id: gsm_a_stat.c,v 1.11 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -53,6 +53,7 @@
#include "../globals.h"
#include "filter_prefs.h"
#include "compat_macros.h"
+#include "ui_util.h"
typedef struct column_arrows {
@@ -417,13 +418,11 @@ gsm_a_stat_gtk_win_create(
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+ dlg_p->scrolled_win = scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(vbox), dlg_p->scrolled_win, TRUE, TRUE, 0);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
diff --git a/gtk/gtk_stat_util.c b/gtk/gtk_stat_util.c
index 957a69b04d..828ed28722 100644
--- a/gtk/gtk_stat_util.c
+++ b/gtk/gtk_stat_util.c
@@ -2,7 +2,7 @@
* gui functions used by stats
* Copyright 2003 Lars Roland
*
- * $Id: gtk_stat_util.c,v 1.3 2003/08/21 17:48:04 guy Exp $
+ * $Id: gtk_stat_util.c,v 1.4 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -101,9 +101,6 @@ create_stat_table(GtkWidget *scrolled_window, GtkWidget *vbox, int columns, char
/* create table */
table = GTK_CLIST(gtk_clist_new_with_titles(columns, titles));
- /* configure scrolling window*/
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
/* configure clist */
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 968efb63d3..d5c51af5f9 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -2,7 +2,7 @@
* h225 message counter for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: h225_counter.c,v 1.8 2004/01/31 03:22:41 guy Exp $
+ * $Id: h225_counter.c,v 1.9 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -50,6 +50,8 @@
#include "../globals.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
+#include "ui_util.h"
+
extern GtkWidget *main_display_filter_widget;
@@ -494,7 +496,7 @@ gtk_h225counter_init(char *optarg)
init_main_stat_window(hs->win, hs->vbox, "ITU-T H.225 Message and Message Reason Counter", filter);
/* init a scrolled window*/
- hs->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ hs->scrolled_window = scrolled_window_new(NULL, NULL);
WIDGET_SET_SIZE(hs->scrolled_window, 400, 200);
hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 2, titles);
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 382ebe9726..6291f69b2a 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -2,7 +2,7 @@
* h225 RAS Service Response Time statistics for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: h225_ras_srt.c,v 1.7 2004/01/31 03:22:41 guy Exp $
+ * $Id: h225_ras_srt.c,v 1.8 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,6 +51,8 @@
#include "../globals.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
+#include "ui_util.h"
+
extern GtkWidget *main_display_filter_widget;
@@ -291,7 +293,7 @@ gtk_h225rassrt_init(char *optarg)
init_main_stat_window(hs->win, hs->vbox, "ITU-T H.225 RAS Service Response Time", filter);
/* init a scrolled window*/
- hs->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ hs->scrolled_window = scrolled_window_new(NULL, NULL);
WIDGET_SET_SIZE(hs->scrolled_window, 600, 160);
hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 11, titles);
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 465650b8d9..70af65ee64 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
/* help_dlg.c
*
- * $Id: help_dlg.c,v 1.45 2004/01/31 03:22:41 guy Exp $
+ * $Id: help_dlg.c,v 1.46 2004/02/06 19:19:10 ulfl Exp $
*
* Laurent Deniel <laurent.deniel@free.fr>
*
@@ -83,7 +83,12 @@ static GtkWidget * help_page(const char *topic, const char *filename)
page_vb = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(page_vb), 1);
txt_scrollw = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start(GTK_BOX(page_vb), txt_scrollw, TRUE, TRUE, 0);
+
#if GTK_MAJOR_VERSION < 2
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
@@ -97,6 +102,13 @@ static GtkWidget * help_page(const char *topic, const char *filename)
txt = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(txt), FALSE);
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt), GTK_WRAP_WORD);
+ gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(txt), FALSE);
+ /* XXX: there seems to be no way to add a small border *around* the whole text,
+ * so the text will be "bump" against the edges.
+ * the following is only working for left and right edges,
+ * there is no such thing for top and bottom :-( */
+ /* gtk_text_view_set_left_margin(GTK_TEXT_VIEW(txt), 3); */
+ /* gtk_text_view_set_right_margin(GTK_TEXT_VIEW(txt), 3); */
#endif
relative_path = g_strconcat(HELP_DIR, G_DIR_SEPARATOR_S, filename, NULL);
@@ -148,7 +160,7 @@ void help_cb(GtkWidget *w _U_, gpointer data _U_)
help_w = dlg_window_new("Ethereal: Help");
SIGNAL_CONNECT(help_w, "destroy", help_destroy_cb, NULL);
/* XXX: improve this, e.g. remember the last window size in a file */
- WIDGET_SET_SIZE(help_w, DEF_WIDTH * 2/3, DEF_HEIGHT * 2/3);
+ WIDGET_SET_SIZE(help_w, DEF_WIDTH, DEF_HEIGHT);
gtk_container_border_width(GTK_CONTAINER(help_w), 2);
/* Container for each row of widgets */
diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c
index bcc650b8c7..cbeb7875b9 100644
--- a/gtk/isup_stat.c
+++ b/gtk/isup_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: isup_stat.c,v 1.13 2004/01/31 03:22:41 guy Exp $
+ * $Id: isup_stat.c,v 1.14 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,8 +51,9 @@
#include "../globals.h"
#include "filter_prefs.h"
#include "compat_macros.h"
-
#include "packet-isup.h"
+#include "ui_util.h"
+
typedef struct column_arrows {
GtkWidget *table;
@@ -309,13 +310,11 @@ isup_stat_gtk_win_create(
gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- dlg_p->scrolled_win = gtk_scrolled_window_new(NULL, NULL);
+ dlg_p->scrolled_win = scrolled_window_new(NULL, NULL);
gtk_widget_ref(dlg_p->scrolled_win);
OBJECT_SET_DATA_FULL(dlg_p->win, "scrolled_win", dlg_p->scrolled_win,
gtk_widget_unref);
gtk_widget_show(dlg_p->scrolled_win);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dlg_p->scrolled_win),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(vbox), dlg_p->scrolled_win, TRUE, TRUE, 0);
dlg_p->table = gtk_clist_new(INIT_TABLE_NUM_COLUMNS);
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 72fd08a89c..bcd262fd7c 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -2,7 +2,7 @@
* mgcp-statistics for ethereal
* Copyright 2003 Lars Roland
*
- * $Id: mgcp_stat.c,v 1.24 2004/01/31 03:22:41 guy Exp $
+ * $Id: mgcp_stat.c,v 1.25 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,6 +51,8 @@
#include "../globals.h"
#include "../tap_dfilter_dlg.h"
#include "tap_dfilter_dlg.h"
+#include "ui_util.h"
+
extern GtkWidget *main_display_filter_widget;
@@ -283,7 +285,7 @@ gtk_mgcpstat_init(char *optarg)
/* GTK1 using a scrollable clist*/
/* init a scrolled window*/
- ms->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ ms->scrolled_window = scrolled_window_new(NULL, NULL);
WIDGET_SET_SIZE(ms->scrolled_window, 550, 150);
ms->table = create_stat_table(ms->scrolled_window, ms->vbox, 7, titles);
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 96674248ab..07e0d17efb 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -1,7 +1,7 @@
/* packet_list.c
* packet list related functions 2002 Olivier Abad
*
- * $Id: packet_list.c,v 1.17 2004/02/03 00:16:59 ulfl Exp $
+ * $Id: packet_list.c,v 1.18 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -491,8 +491,12 @@ packet_list_new(e_prefs *prefs)
/* Packet list */
pkt_scrollw = scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(pkt_scrollw),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#if GTK_MAJOR_VERSION >= 2
+ /* the eth_clist will have it's own GTK_SHADOW_IN, so don't use a shadow
+ * for both widgets */
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(pkt_scrollw),
+ GTK_SHADOW_NONE);
+#endif
packet_list = eth_clist_new(cfile.cinfo.num_cols);
/* Column titles are filled in below */
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index 1278aa7e75..968e3da577 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.c
@@ -1,7 +1,7 @@
/* plugins_dlg.c
* Dialog boxes for plugins
*
- * $Id: plugins_dlg.c,v 1.33 2004/01/21 21:19:33 ulfl Exp $
+ * $Id: plugins_dlg.c,v 1.34 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,9 +31,7 @@
#include "globals.h"
#include <epan/plugins.h>
#include "dlg_utils.h"
-#if GTK_MAJOR_VERSION >= 2
#include "ui_util.h"
-#endif
#include "compat_macros.h"
#ifdef HAVE_PLUGINS
@@ -79,11 +77,13 @@ tools_plugins_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
gtk_container_set_border_width(GTK_CONTAINER(frame_hbox), 5);
gtk_widget_show(frame_hbox);
- scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
+ scrolledwindow = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start(GTK_BOX(frame_hbox), scrolledwindow, TRUE, TRUE, 0);
WIDGET_SET_SIZE(scrolledwindow, 250, 200);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_show(scrolledwindow);
#if GTK_MAJOR_VERSION < 2
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index b67d66d029..0fb567bd51 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.78 2004/01/31 03:22:41 guy Exp $
+ * $Id: prefs_dlg.c,v 1.79 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -397,6 +397,10 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
/* Place a Ctree on the left for preference categories */
ct_sb = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ct_sb),
+ GTK_SHADOW_IN);
+#endif
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ct_sb),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(top_hb), ct_sb);
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index bca706f678..1ff6c6d2d6 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
/* proto_dlg.c
*
- * $Id: proto_dlg.c,v 1.31 2004/01/31 03:22:41 guy Exp $
+ * $Id: proto_dlg.c,v 1.32 2004/02/06 19:19:10 ulfl Exp $
*
* Laurent Deniel <laurent.deniel@free.fr>
*
@@ -139,7 +139,11 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_container_border_width(GTK_CONTAINER(proto_vb), 5);
gtk_widget_show(proto_vb);
- proto_sw = gtk_scrolled_window_new(NULL, NULL);
+ proto_sw = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(proto_sw),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start(GTK_BOX(proto_vb), proto_sw, TRUE, TRUE, 0);
gtk_widget_show(proto_sw);
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 51726744c4..506eb6941a 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.85 2004/01/31 03:22:41 guy Exp $
+ * $Id: proto_draw.c,v 1.86 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -605,6 +605,9 @@ byte_view_new(void)
byte_nb = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(byte_nb), GTK_POS_BOTTOM);
+ /* this will only have an effect, if no tabs are shown */
+ gtk_notebook_set_show_border(GTK_NOTEBOOK(byte_nb), FALSE);
+
/* Add a placeholder byte view so that there's at least something
displayed in the byte view notebook. */
add_byte_tab(byte_nb, "", NULL, NULL, NULL);
@@ -644,11 +647,6 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb,
/* Byte view. Create a scrolled window for the text. */
byte_scrollw = scrolled_window_new(NULL, NULL);
-
- /* Add scrolled pane to tabbed window */
- label = gtk_label_new(name);
- gtk_notebook_append_page(GTK_NOTEBOOK(byte_nb), byte_scrollw, label);
-
#if GTK_MAJOR_VERSION < 2
/* The horizontal scrollbar of the scroll-window doesn't seem
* to affect the GtkText widget at all, even when line wrapping
@@ -658,10 +656,13 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, tvbuff_t *tvb,
/* Horizontal */GTK_POLICY_NEVER,
/* Vertical*/ GTK_POLICY_ALWAYS);
#else
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(byte_scrollw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(byte_scrollw),
+ GTK_SHADOW_IN);
#endif
+ /* Add scrolled pane to tabbed window */
+ label = gtk_label_new(name);
+ gtk_notebook_append_page(GTK_NOTEBOOK(byte_nb), byte_scrollw, label);
+
gtk_widget_show(byte_scrollw);
#if GTK_MAJOR_VERSION < 2
@@ -1504,12 +1505,9 @@ main_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p)
/* Tree view */
tv_scrollw = scrolled_window_new(NULL, NULL);
-#if GTK_MAJOR_VERSION < 2
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(tv_scrollw),
- GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS);
-#else
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(tv_scrollw),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tv_scrollw),
+ GTK_SHADOW_IN);
#endif
#if GTK_MAJOR_VERSION < 2
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 9a3a534b8e..cfaa2e43d7 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -1,6 +1,6 @@
/* proto_hier_stats_dlg.c
*
- * $Id: proto_hier_stats_dlg.c,v 1.14 2004/01/21 21:19:34 ulfl Exp $
+ * $Id: proto_hier_stats_dlg.c,v 1.15 2004/02/06 19:19:10 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -179,10 +179,11 @@ create_tree(GtkWidget *container, ph_stats_t *ps)
#endif
/* Scrolled Window */
- sw = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ sw = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+ GTK_SHADOW_IN);
+#endif
gtk_container_add(GTK_CONTAINER(container), sw);
#if GTK_MAJOR_VERSION < 2
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index c549a96b28..c878f1c908 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1,7 +1,7 @@
/* rtp_analysis.c
* RTP analysis addition for ethereal
*
- * $Id: rtp_analysis.c,v 1.31 2004/01/31 09:48:26 guy Exp $
+ * $Id: rtp_analysis.c,v 1.32 2004/02/06 19:19:10 ulfl Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
@@ -1976,10 +1976,8 @@ void create_rtp_dialog(user_data_t* user_data)
gtk_box_pack_end(GTK_BOX(page), label_stats_fwd, FALSE, FALSE, 0);
/* scrolled window */
- scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ scrolled_window = scrolled_window_new(NULL, NULL);
WIDGET_SET_SIZE(scrolled_window, 560, 200);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
/* packet clist */
clist_fwd = create_clist(user_data);
@@ -2000,10 +1998,8 @@ void create_rtp_dialog(user_data_t* user_data)
label_stats_rev = gtk_label_new("\n");
gtk_box_pack_end(GTK_BOX(page_r), label_stats_rev, FALSE, FALSE, 0);
- scrolled_window_r = gtk_scrolled_window_new(NULL, NULL);
+ scrolled_window_r = scrolled_window_new(NULL, NULL);
WIDGET_SET_SIZE(scrolled_window_r, 560, 200);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window_r),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
clist_rev = create_clist(user_data);
gtk_widget_show(clist_rev);
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 17d33fc955..4fe9bcdb41 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -1,7 +1,7 @@
/* rtp_stream_dlg.c
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream_dlg.c,v 1.12 2004/01/26 19:16:30 obiot Exp $
+ * $Id: rtp_stream_dlg.c,v 1.13 2004/02/06 19:19:11 ulfl Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
@@ -622,7 +622,7 @@ static void rtpstream_dlg_create (void)
gtk_widget_show (label10);
gtk_box_pack_start (GTK_BOX (vbox1), label10, FALSE, FALSE, 8);
- scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ scrolledwindow1 = scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwindow1);
gtk_box_pack_start (GTK_BOX (vbox1), scrolledwindow1, TRUE, TRUE, 0);
diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 54b3051e49..07a1bbe37b 100644
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -3,7 +3,7 @@
* Helper routines common to all service response time statistics
* tap.
*
- * $Id: service_response_time_table.c,v 1.13 2004/01/31 03:22:42 guy Exp $
+ * $Id: service_response_time_table.c,v 1.14 2004/02/06 19:19:11 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,6 +44,7 @@
#include "color.h"
#include "gtk/color_dlg.h"
#include "main.h"
+#include "ui_util.h"
extern GtkWidget *main_display_filter_widget;
#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
@@ -342,8 +343,7 @@ init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, char *filter
} else {
rst->filter_string=NULL;
}
- rst->scrolled_window=gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(rst->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ rst->scrolled_window=scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(vbox), rst->scrolled_window, TRUE, TRUE, 0);
rst->table=(GtkCList *)gtk_clist_new(6);
diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c
index 2972167c7d..558948c3df 100644
--- a/gtk/supported_protos_dlg.c
+++ b/gtk/supported_protos_dlg.c
@@ -117,6 +117,10 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_container_border_width(GTK_CONTAINER(proto_vb), 1);
txt_scrollw = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start(GTK_BOX(proto_vb), txt_scrollw, TRUE, TRUE, 0);
#if GTK_MAJOR_VERSION < 2
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
@@ -129,9 +133,6 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(txt_scrollw),
proto_text);
#else
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
proto_text = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(proto_text), FALSE);
set_supported_text(proto_text, PROTOCOL_SUPPORTED);
@@ -155,6 +156,10 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_container_border_width(GTK_CONTAINER(dfilter_tb), 1);
txt_scrollw = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
+ GTK_SHADOW_IN);
+#endif
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
GTK_POLICY_ALWAYS,
GTK_POLICY_NEVER);
@@ -183,10 +188,11 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_container_border_width(GTK_CONTAINER(dfilter_vb), 1);
txt_scrollw = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start(GTK_BOX(dfilter_vb), txt_scrollw, TRUE, TRUE, 0);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
dfilter_text = gtk_text_view_new();
if (prefs.gui_scrollbar_on_right) {
gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(txt_scrollw),
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 0f8dbfa9ea..1b689c8ae0 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.49 2004/01/31 03:22:42 guy Exp $
+ * $Id: tcp_graph.c,v 1.50 2004/02/06 19:19:11 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -594,6 +594,10 @@ static void create_text_widget (struct graph *g)
gtk_widget_show (box);
txt_scrollw = scrolled_window_new (NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scrollw),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start (GTK_BOX (box), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (txt_scrollw),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
@@ -1022,9 +1026,11 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data _U_)
box = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (toplevel), box);
- scroll = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ scroll = scrolled_window_new (NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start (GTK_BOX (box), scroll, TRUE, TRUE, 0);
#if GTK_MAJOR_VERSION < 2
text = gtk_text_new (NULL, NULL);
diff --git a/gtk/ui_util.c b/gtk/ui_util.c
index b7cd1b8aae..999e91dbe2 100644
--- a/gtk/ui_util.c
+++ b/gtk/ui_util.c
@@ -1,7 +1,7 @@
/* ui_util.c
* UI utility routines
*
- * $Id: ui_util.c,v 1.17 2004/01/30 06:43:16 ulfl Exp $
+ * $Id: ui_util.c,v 1.18 2004/02/06 19:19:11 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -311,6 +311,9 @@ setup_scrolled_window(GtkWidget *scrollw)
{
set_scrollbar_placement_scrollw(scrollw);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollw),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
scrolled_windows = g_list_append(scrolled_windows, scrollw);
/* Catch the "destroy" event on the widget, so that we remove it from
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 22:19:05 +0000