diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-11 07:40:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-11 07:40:32 +0000 |
| commit | feb5791d6ae22cca80342e84961273ddaaf52b6f (patch) | |
| tree | 467547aec98e0b9c4656c1d3ff930b5a308bd1f7 /gtk/proto_dlg.c | |
| parent | e592fa4a6bdf6342a790f488596c73d2332c9d27 (diff) | |
| download | wireshark-feb5791d6ae22cca80342e84961273ddaaf52b6f.tar.gz | |
Have a routine to create a scrolled window, set its vertical scrollbar
preference, and add it to the list of scrolled windows; call that
routine to create scrolled windows, rather than creating it and calling
other routines to do the other two operations.
As "set_scrollbar_placement_all()" and "set_ctree_styles_all()" always
set the styles to match the user's preference, don't have them take an
argument, have them just use the user's preference settings.
Get rid of unnecessary includes of "prefs_dlg.h", replacing them with
includes of "prefs.h" if necessary. Don't have "prefs_dlg.h" include
"prefs.h" - its sole purpose is to declare routines defined in
"prefs_dlg.c" - and add any additional includes of "prefs.h" this
requires.
Get rid of unnecessary includes of "prefs.h" and "gtkglobals.h".
Fix up white space.
svn path=/trunk/; revision=4521
Diffstat (limited to 'gtk/proto_dlg.c')
| -rw-r--r-- | gtk/proto_dlg.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index e94906a375..4a137a78a9 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -1,11 +1,11 @@ /* proto_dlg.c * - * $Id: proto_dlg.c,v 1.8 2001/03/01 21:34:09 gram Exp $ + * $Id: proto_dlg.c,v 1.9 2002/01/11 07:40:31 guy Exp $ * * Laurent Deniel <deniel@worldnet.fr> * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 2000 Gerald Combs * * This program is free software; you can redistribute it and/or @@ -21,7 +21,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * */ #ifdef HAVE_CONFIG_H @@ -39,7 +38,6 @@ #include "prefs.h" #include "globals.h" -#include "gtkglobals.h" #include "main.h" #include "util.h" #include "ui_util.h" @@ -112,13 +110,11 @@ void proto_cb(GtkWidget *w, gpointer data) label = gtk_label_new("Button pressed: protocol decoding is enabled"); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(selection_vb), label, FALSE, FALSE, 0); - scrolled_w = gtk_scrolled_window_new(NULL, NULL); + scrolled_w = scrolled_window_new(NULL, NULL); gtk_container_set_border_width(GTK_CONTAINER(scrolled_w), 1); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_w), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - set_scrollbar_placement_scrollw(scrolled_w, prefs.gui_scrollbar_on_right); - remember_scrolled_window(scrolled_w); gtk_box_pack_start(GTK_BOX(selection_vb), scrolled_w, TRUE, TRUE, 0); show_proto_selection(proto_w, scrolled_w); gtk_widget_show(scrolled_w); |