remove extraneous prototypes, patch from Sam O'Connor

Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>

        * gdk/gdk.h:
        * gtk/gtkaccelgroup.h:
        * gtk/gtkthemes.h: remove extraneous prototypes, patch from
        Sam O'Connor <oconnor@eiffel.com>.

10 files changed, 49 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index cfee31148..9736430f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdk.h:
+	* gtk/gtkaccelgroup.h:
+	* gtk/gtkthemes.h: remove extraneous prototypes, patch from
+	Sam O'Connor <oconnor@eiffel.com>.
+
 Wed Feb 16 05:22:36 CST 2000 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.7
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index cfee31148..9736430f7 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdk.h:
+	* gtk/gtkaccelgroup.h:
+	* gtk/gtkthemes.h: remove extraneous prototypes, patch from
+	Sam O'Connor <oconnor@eiffel.com>.
+
 Wed Feb 16 05:22:36 CST 2000 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.7
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cfee31148..9736430f7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdk.h:
+	* gtk/gtkaccelgroup.h:
+	* gtk/gtkthemes.h: remove extraneous prototypes, patch from
+	Sam O'Connor <oconnor@eiffel.com>.
+
 Wed Feb 16 05:22:36 CST 2000 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.7
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cfee31148..9736430f7 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdk.h:
+	* gtk/gtkaccelgroup.h:
+	* gtk/gtkthemes.h: remove extraneous prototypes, patch from
+	Sam O'Connor <oconnor@eiffel.com>.
+
 Wed Feb 16 05:22:36 CST 2000 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.7
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cfee31148..9736430f7 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdk.h:
+	* gtk/gtkaccelgroup.h:
+	* gtk/gtkthemes.h: remove extraneous prototypes, patch from
+	Sam O'Connor <oconnor@eiffel.com>.
+
 Wed Feb 16 05:22:36 CST 2000 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.7
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cfee31148..9736430f7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdk.h:
+	* gtk/gtkaccelgroup.h:
+	* gtk/gtkthemes.h: remove extraneous prototypes, patch from
+	Sam O'Connor <oconnor@eiffel.com>.
+
 Wed Feb 16 05:22:36 CST 2000 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.7
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cfee31148..9736430f7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Feb 17 02:19:32 2000  Tim Janik  <timj@gtk.org>
+
+	* gdk/gdk.h:
+	* gtk/gtkaccelgroup.h:
+	* gtk/gtkthemes.h: remove extraneous prototypes, patch from
+	Sam O'Connor <oconnor@eiffel.com>.
+
 Wed Feb 16 05:22:36 CST 2000 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 1.2.7
diff --git a/gdk/gdk.h b/gdk/gdk.h
index bfeb5f052..28b8d319a 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -710,15 +710,6 @@ void gdk_draw_pixmap	 (GdkDrawable  *drawable,
 			  gint		ydest,
 			  gint		width,
 			  gint		height);
-void gdk_draw_bitmap	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkDrawable  *src,
-			  gint		xsrc,
-			  gint		ysrc,
-			  gint		xdest,
-			  gint		ydest,
-			  gint		width,
-			  gint		height);
 void gdk_draw_image	 (GdkDrawable  *drawable,
 			  GdkGC	       *gc,
 			  GdkImage     *image,
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 2db22ad60..13fdf5bef 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -158,14 +158,6 @@ guint		gtk_accel_group_create_add	(GtkType	 class_type,
 guint		gtk_accel_group_create_remove	(GtkType	 class_type,
 						 GtkSignalRunType signal_flags,
 						 guint		 handler_offset);
-void		gtk_accel_group_marshal_add	(GtkObject	*object,
-						 GtkSignalFunc	 func,
-						 gpointer	 func_data,
-						 GtkArg		*args);
-void		gtk_accel_group_marshal_remove	(GtkObject	*object,
-						 GtkSignalFunc	 func,
-						 gpointer	 func_data,
-						 GtkArg		*args);
 
 /* Miscellaneous (internal)
  */
diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h
index a0e162024..398d050e6 100644
--- a/gtk/gtkthemes.h
+++ b/gtk/gtkthemes.h
@@ -81,19 +81,5 @@ GtkThemeEngine *gtk_theme_engine_get   (const gchar    *name);
 void            gtk_theme_engine_ref   (GtkThemeEngine *engine);
 void            gtk_theme_engine_unref (GtkThemeEngine *engine);
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Initialization, exit, mainloop and miscellaneous routines
- */
-void	   gtk_themes_init	 (int	       *argc,
-				  char	     ***argv);
-void	   gtk_themes_exit	 (gint		error_code);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 
 #endif /* __GTK_THEMES_H__ */