diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-03-24 02:23:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-03-24 02:23:08 +0000 |
| commit | 9b85728d1d52cd698d3f09e33ead42733a666657 (patch) | |
| tree | 77743027001f6319a274a9e32dd30a6b9a4449f7 /gtk | |
| parent | 8ac0e6618a2d2bad339d7455de064c8383fab318 (diff) | |
| download | wireshark-9b85728d1d52cd698d3f09e33ead42733a666657.tar.gz wireshark-9b85728d1d52cd698d3f09e33ead42733a666657.tar.bz2 wireshark-9b85728d1d52cd698d3f09e33ead42733a666657.zip | |
"reactivate_window()" is used only by stuff in the "gtk" directory, and
has an API that depends on GTK+. "set_main_window_name()" is
UI-toolkit-independent. Declare the former in a new "gtk/ui_util.h"
file, rather than in "ui_util.h"; this helps separate
UI-toolkit-independent stuff from UI-toolkit-dependent stuff.
svn path=/trunk/; revision=3181
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 5 | ||||
| -rw-r--r-- | gtk/ui_util.c | 3 | ||||
| -rw-r--r-- | gtk/ui_util.h | 36 |
3 files changed, 41 insertions, 3 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 68c3c5d768..51c724cac6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for the GTK interface routines for Ethereal # -# $Id: Makefile.am,v 1.34 2001/03/22 23:54:47 gram Exp $ +# $Id: Makefile.am,v 1.35 2001/03/24 02:23:08 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -89,7 +89,8 @@ libui_a_SOURCES = \ stream_prefs.h \ summary_dlg.c \ summary_dlg.h \ - ui_util.c + ui_util.c \ + ui_util.h EXTRA_DIST = \ Makefile.nmake diff --git a/gtk/ui_util.c b/gtk/ui_util.c index c652ef85eb..e37bb6c934 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.3 2000/01/03 06:59:25 guy Exp $ + * $Id: ui_util.c,v 1.4 2001/03/24 02:23:08 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -33,6 +33,7 @@ #include "gtkglobals.h" #include "ui_util.h" +#include "../ui_util.h" /* Set the name of the top-level window and its icon. XXX - for some reason, KWM insists on making the icon name be just diff --git a/gtk/ui_util.h b/gtk/ui_util.h new file mode 100644 index 0000000000..361fcae413 --- /dev/null +++ b/gtk/ui_util.h @@ -0,0 +1,36 @@ +/* ui_util.h + * Definitions for UI utility routines + * + * $Id: ui_util.h,v 1.1 2001/03/24 02:23:08 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@zing.org> + * Copyright 1998 Gerald Combs + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + */ + +#ifndef __GTKGUIUI_UTIL_H__ +#define __GTKGUIUI_UTIL_H__ + +/* Given a pointer to a GtkWidget for a top-level window, raise it and + de-iconify it. This routine is used if the user has done something to + ask that a window of a certain type be popped up when there can be only + one such window and such a window has already been popped up - we + pop up the existing one rather than creating a new one. */ +void reactivate_window(GtkWidget *); + +#endif /* __GTKGUIUI_UTIL_H__ */ |