Remove 3 GTK+ header files and have our gtkclist.c use

the the system version of the gtk header files.

svn path=/trunk/; revision=1238

5 files changed, 4 insertions, 488 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3154e6b3e6..e339ff390b 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.11 1999/12/02 04:30:13 gerald Exp $
+# $Id: Makefile.am,v 1.12 1999/12/07 22:06:25 gram Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -40,12 +40,9 @@ libui_a_SOURCES = \
 	find_dlg.h	\
 	goto_dlg.c	\
 	goto_dlg.h	\
-	gtkbindings.h	\
 	gtkclist.c	\
 	gtkclist.h	\
-	gtkdnd.h	\
 	gtkglobals.h	\
-	gtkmain.h	\
 	keys.h		\
 	main.c		\
 	main.h		\
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
deleted file mode 100644
index b603827049..0000000000
--- a/gtk/gtkbindings.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkBindingSet: Keybinding manager for GtkObjects.
- * Copyright (C) 1998 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_BINDINGS_H__
-#define __GTK_BINDINGS_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkenums.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* Pattern matching
- */
-typedef struct	_GtkPatternSpec	GtkPatternSpec;
-
-struct _GtkPatternSpec
-{
-  GtkMatchType	 match_type;
-  guint		 pattern_length;
-  gchar		*pattern;
-  gchar		*pattern_reversed;
-  gpointer	 user_data;
-  guint		 seq_id;
-};
-
-void	 gtk_pattern_spec_init	    (GtkPatternSpec	 *pspec,
-				     const gchar	 *pattern);
-void	 gtk_pattern_spec_free_segs (GtkPatternSpec	 *pspec);
-gboolean gtk_pattern_match	    (GtkPatternSpec	 *pspec,
-				     guint		  string_length,
-				     const gchar	 *string,
-				     const gchar	 *string_reversed);
-gboolean gtk_pattern_match_string   (GtkPatternSpec	 *pspec,
-				     const gchar	 *string);
-gboolean gtk_pattern_match_simple   (const gchar	 *pattern,
-				     const gchar	 *string);
-
-
-/* Binding sets
- */
-
-typedef struct _GtkBindingSet		GtkBindingSet;
-typedef struct _GtkBindingEntry		GtkBindingEntry;
-typedef struct _GtkBindingSignal	GtkBindingSignal;
-typedef struct _GtkBindingArg		GtkBindingArg;
-
-struct _GtkBindingSet
-{
-  gchar			*set_name;
-  gint			 priority;
-  GSList		*widget_path_pspecs;
-  GSList		*widget_class_pspecs;
-  GSList		*class_branch_pspecs;
-  GtkBindingEntry	*entries;
-  GtkBindingEntry	*current;
-};
-
-struct _GtkBindingEntry
-{
-  /* key portion
-   */
-  guint			 keyval;
-  guint			 modifiers;
-  
-  GtkBindingSet		*binding_set;
-  guint			destroyed : 1;
-  guint			in_emission : 1;
-  GtkBindingEntry	*set_next;
-  GtkBindingEntry	*hash_next;
-  GtkBindingSignal	*signals;
-};
-
-struct _GtkBindingSignal
-{
-  GtkBindingSignal	*next;
-  gchar			*signal_name;
-  guint			 n_args;
-  GtkBindingArg		*args;
-};
-
-struct _GtkBindingArg
-{
-  GtkType	arg_type;
-  union {
-    glong	 long_data;
-    gdouble	 double_data;
-    gchar	*string_data;
-  } d;
-};
-
-
-/* Application-level methods */
-
-GtkBindingSet*	gtk_binding_set_new	(const gchar	*set_name);
-GtkBindingSet*	gtk_binding_set_by_class(gpointer	 object_class);
-GtkBindingSet*	gtk_binding_set_find	(const gchar	*set_name);
-gboolean gtk_bindings_activate		(GtkObject	*object,
-					 guint		 keyval,
-					 guint		 modifiers);
-gboolean gtk_binding_set_activate	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 guint		 modifiers,
-					 GtkObject	*object);
-#define	 gtk_binding_entry_add		gtk_binding_entry_clear
-void	 gtk_binding_entry_clear	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 guint		 modifiers);
-void	 gtk_binding_entry_add_signal	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 guint		 modifiers,
-					 const gchar	*signal_name,
-					 guint		 n_args,
-					 ...);
-void	 gtk_binding_set_add_path	(GtkBindingSet	*binding_set,
-					 GtkPathType	 path_type,
-					 const gchar	*path_pattern,
-					 GtkPathPriorityType priority);
-
-
-/* Non-public methods */
-
-void	 gtk_binding_entry_remove	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 guint		 modifiers);
-void	 gtk_binding_entry_add_signall	(GtkBindingSet	*binding_set,
-					 guint		 keyval,
-					 guint		 modifiers,
-					 const gchar	*signal_name,
-					 GSList		*binding_args);
-guint	 gtk_binding_parse_binding	(GScanner	*scanner);
-
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_BINDINGS_H__ */
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 583e797e31..43323cdbc5 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -28,10 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
-#include "gtkmain.h"
+#include <gtk/gtkmain.h>
 #include "gtkclist.h"
-#include "gtkbindings.h"
-#include "gtkdnd.h"
+#include <gtk/gtkbindings.h>
+#include <gtk/gtkdnd.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
deleted file mode 100644
index 672a742f69..0000000000
--- a/gtk/gtkdnd.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DND_H__
-#define __GTK_DND_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum {
-  GTK_DEST_DEFAULT_MOTION     = 1 << 0, /* respond to "drag_motion" */
-  GTK_DEST_DEFAULT_HIGHLIGHT  = 1 << 1, /* auto-highlight */
-  GTK_DEST_DEFAULT_DROP       = 1 << 2, /* respond to "drag_drop" */
-  GTK_DEST_DEFAULT_ALL        = 0x07
-} GtkDestDefaults;
-
-/* Flags for the GtkTargetEntry on the destination side 
- */
-typedef enum {
-  GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
-  GTK_TARGET_SAME_WIDGET = 1 << 1  /*< nick=same-widget >*/
-} GtkTargetFlags;
-
-/* Destination side */
-
-void gtk_drag_get_data (GtkWidget      *widget,
-			GdkDragContext *context,
-			GdkAtom         target,
-			guint32         time);
-void gtk_drag_finish   (GdkDragContext *context,
-			gboolean        success,
-			gboolean        del,
-			guint32         time);
-
-GtkWidget *gtk_drag_get_source_widget (GdkDragContext *context);
-
-void gtk_drag_highlight   (GtkWidget  *widget);
-void gtk_drag_unhighlight (GtkWidget  *widget);
-
-void gtk_drag_dest_set   (GtkWidget            *widget,
-			  GtkDestDefaults       flags,
-  		          const GtkTargetEntry *targets,
-			  gint                  n_targets,
-			  GdkDragAction         actions);
-
-void gtk_drag_dest_set_proxy (GtkWidget      *widget,
-			      GdkWindow      *proxy_window,
-			      GdkDragProtocol protocol,
-			      gboolean        use_coordinates);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-void gtk_drag_dest_unset (GtkWidget          *widget);
-
-/* Source side */
-
-void gtk_drag_source_set  (GtkWidget            *widget,
-			   GdkModifierType       start_button_mask,
-			   const GtkTargetEntry *targets,
-			   gint                  n_targets,
-			   GdkDragAction         actions);
-
-void gtk_drag_source_unset (GtkWidget        *widget);
-
-void gtk_drag_source_set_icon (GtkWidget     *widget,
-			       GdkColormap   *colormap,
-			       GdkPixmap     *pixmap,
-			       GdkBitmap     *mask);
-
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
-GdkDragContext *gtk_drag_begin (GtkWidget         *widget,
-				GtkTargetList     *targets,
-				GdkDragAction      actions,
-				gint               button,
-				GdkEvent          *event);
-
-/* Set the image being dragged around
- */
-void gtk_drag_set_icon_widget  (GdkDragContext    *context,
-				GtkWidget         *widget,
-				gint               hot_x,
-				gint               hot_y);
-
-void gtk_drag_set_icon_pixmap  (GdkDragContext    *context,
-				GdkColormap       *colormap,
-				GdkPixmap         *pixmap,
-				GdkBitmap         *mask,
-				gint               hot_x,
-				gint               hot_y);
-
-void gtk_drag_set_icon_default (GdkDragContext    *context);
-
-void gtk_drag_set_default_icon (GdkColormap   *colormap,
-				GdkPixmap     *pixmap,
-				GdkBitmap     *mask,
-			        gint           hot_x,
-			        gint           hot_y);
-
-
-/* Internal functions */
-void gtk_drag_source_handle_event (GtkWidget *widget,
-				   GdkEvent  *event);
-void gtk_drag_dest_handle_event (GtkWidget *toplevel,
-				 GdkEvent  *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GTK_DND_H__ */
-
-
-
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
deleted file mode 100644
index 44629283ad..0000000000
--- a/gtk/gtkmain.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_MAIN_H__
-#define __GTK_MAIN_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Priorities for redrawing and resizing
- */
-#define GTK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
-#define GTK_PRIORITY_RESIZE     (G_PRIORITY_HIGH_IDLE + 10)
-
-/* Deprecated. Use G_PRIORITY #define's instead
- */
-#define GTK_PRIORITY_HIGH       G_PRIORITY_HIGH
-#define GTK_PRIORITY_INTERNAL   GTK_PRIORITY_REDRAW
-#define GTK_PRIORITY_DEFAULT	G_PRIORITY_DEFAULT_IDLE
-#define GTK_PRIORITY_LOW	G_PRIORITY_LOW
-
-typedef void	(*GtkModuleInitFunc)	(gint		*argc,
-					 gchar	      ***argv);
-typedef gint	(*GtkKeySnoopFunc)	(GtkWidget	*grab_widget,
-					 GdkEventKey	*event,
-					 gpointer	 func_data);
-
-/* Gtk version.
- */
-extern const guint gtk_major_version;
-extern const guint gtk_minor_version;
-extern const guint gtk_micro_version;
-extern const guint gtk_binary_age;
-extern const guint gtk_interface_age;
-gchar* gtk_check_version (guint	required_major,
-			  guint	required_minor,
-			  guint	required_micro);
-
-
-/* Initialization, exit, mainloop and miscellaneous routines
- */
-void	   gtk_init		 (int	       *argc,
-				  char	     ***argv);
-gboolean   gtk_init_check        (int	       *argc,
-				  char	     ***argv);
-void	   gtk_exit		 (gint		error_code);
-gchar*	   gtk_set_locale	 (void);
-gint	   gtk_events_pending	 (void);
-
-/* The following is the event func GTK+ registers with GDK
- * we expose it mainly to allow filtering of events between
- * GDK and GTK+.
- */
-void  gtk_main_do_event          (GdkEvent           *event);
-
-void	   gtk_main		 (void);
-guint	   gtk_main_level	 (void);
-void	   gtk_main_quit	 (void);
-gint	   gtk_main_iteration	 (void);
-/* gtk_main_iteration() calls gtk_main_iteration_do(TRUE) */
-gint	   gtk_main_iteration_do (gboolean blocking);
-
-gint	   gtk_true		   (void);
-gint	   gtk_false		   (void);
-
-void	   gtk_grab_add		   (GtkWidget	       *widget);
-GtkWidget* gtk_grab_get_current	   (void);
-void	   gtk_grab_remove	   (GtkWidget	       *widget);
-
-void	   gtk_init_add		   (GtkFunction	       function,
-				    gpointer	       data);
-void	   gtk_quit_add_destroy	   (guint	       main_level,
-				    GtkObject	      *object);
-guint	   gtk_quit_add		   (guint	       main_level,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_quit_add_full	   (guint	       main_level,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_quit_remove	   (guint	       quit_handler_id);
-void	   gtk_quit_remove_by_data (gpointer	       data);
-guint	   gtk_timeout_add	   (guint32	       interval,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_timeout_add_full	   (guint32	       interval,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_timeout_remove	   (guint	       timeout_handler_id);
-
-guint	   gtk_idle_add		   (GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_idle_add_priority   (gint	       priority,
-				    GtkFunction	       function,
-				    gpointer	       data);
-guint	   gtk_idle_add_full	   (gint	       priority,
-				    GtkFunction	       function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_idle_remove	   (guint	       idle_handler_id);
-void	   gtk_idle_remove_by_data (gpointer	       data);
-guint	   gtk_input_add_full	   (gint	       source,
-				    GdkInputCondition  condition,
-				    GdkInputFunction   function,
-				    GtkCallbackMarshal marshal,
-				    gpointer	       data,
-				    GtkDestroyNotify   destroy);
-void	   gtk_input_remove	   (guint	       input_handler_id);
-
-
-guint	   gtk_key_snooper_install (GtkKeySnoopFunc snooper,
-				    gpointer	    func_data);
-void	   gtk_key_snooper_remove  (guint	    snooper_handler_id);
-  
-GdkEvent*  gtk_get_current_event   (void);
-GtkWidget* gtk_get_event_widget	   (GdkEvent	   *event);
-
-
-/* Private routines internal to GTK+ 
- */
-void       gtk_propagate_event     (GtkWidget         *widget,
-				    GdkEvent          *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_MAIN_H__ */