Remove deprecated code: GtkPaned

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 37415ee19fc08421551a3bd8d0f1f4d9bb527874..ceb14039463e6e98284e69b68fc2836e6b3aaef7 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -2845,12 +2845,10 @@ gtk_option_menu_get_type
 GtkPaned
 gtk_paned_add1
 gtk_paned_add2
-gtk_paned_gutter_size
 gtk_paned_pack1
 gtk_paned_pack2
 gtk_paned_get_child1
 gtk_paned_get_child2
-gtk_paned_set_gutter_size
 gtk_paned_set_position
 gtk_paned_get_position
 gtk_paned_get_handle_window
@@ -2864,7 +2862,6 @@ GTK_PANED_GET_CLASS
 
 <SUBSECTION Private>
 gtk_paned_get_type
-gtk_paned_compute_position
 </SECTION>
 
 <SECTION>

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 4a7c4e2b3b736f6ad09c795b2bfc25af21c30369..cc4ef58e76b6d8f1373c008f46354242f043b1a8 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -3117,16 +3117,6 @@ the names, types, and values of the arguments).
 @packer: 
 @spacing: 
 
-<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
-<para>
-Internal function used by #GtkHPaned and #GtkVPaned
-</para>
-
-@paned: 
-@allocation: 
-@child1_req: 
-@child2_req: 
-
 <!-- ##### MACRO gtk_paned_handle_size ##### -->
 <para>
 Old name for gtk_paned_set_handle_size().

diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml
index c7976a2b0df0ac11772604aa181f4cb25aa16875..8ccef04e043761dc58677a4a4bab6e760aa55b46 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkpaned.sgml
+++ b/docs/reference/gtk/tmpl/gtkpaned.sgml
@@ -191,15 +191,6 @@ parameters. This is equivalent to
 @child: the child to add
 
 
-<!-- ##### MACRO gtk_paned_gutter_size ##### -->
-<para>
-Old name for gtk_paned_set_gutter_size().
-</para>
-
-@p: a paned widget
-@s: the width of the gutter in pixels
-
-
 <!-- ##### FUNCTION gtk_paned_pack1 ##### -->
 <para>
 Adds a child to the top or left pane.
@@ -240,16 +231,6 @@ Adds a child to the bottom or right pane.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_paned_set_gutter_size ##### -->
-<para>
-In older versions of GTK+, this function used to set the width of the 
-gutter (the area between the two panes). It does nothing now.
-</para>
-
-@p: a paned widget
-@s: the width of the gutter in pixels
-
-
 <!-- ##### FUNCTION gtk_paned_set_position ##### -->
 <para>
 

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 5ec20e7d447c56e3f05b1c02c841577e07ffdac5..0d05fdd04721e7af7a63d6b89e72e6e0c8f890c2 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2459,9 +2459,6 @@ gtk_paned_get_type G_GNUC_CONST
 gtk_paned_pack1
 gtk_paned_pack2
 gtk_paned_set_position
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_paned_compute_position
-#endif
 #endif
 #endif
 

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index a24468697ba2085f7141a6810257e89c857623c4..ae27929c1d05a21aa792f349836f1ec6a98b9c92 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1570,17 +1570,6 @@ gtk_paned_get_child2 (GtkPaned *paned)
   return paned->child2;
 }
 
-void
-gtk_paned_compute_position (GtkPaned *paned,
-                           gint      allocation,
-                           gint      child1_req,
-                           gint      child2_req)
-{
-  g_return_if_fail (GTK_IS_PANED (paned));
-
-  gtk_paned_calc_position (paned, allocation, child1_req, child2_req);
-}
-
 static void
 gtk_paned_calc_position (GtkPaned *paned,
                          gint      allocation,

diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 1da08a88f123b1fc09f6e5bb16dfb3eb347616ad..7721f947c2f4c5ed9316bd478045eb929089c021 100644 (file)
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -127,17 +127,6 @@ void        gtk_paned_set_position (GtkPaned       *paned,
 GtkWidget * gtk_paned_get_child1   (GtkPaned       *paned);
 GtkWidget * gtk_paned_get_child2   (GtkPaned       *paned);
 
-GdkWindow * gtk_paned_get_handle_window (GtkPaned  *paned);
-
-#ifndef GTK_DISABLE_DEPRECATED
-/* Internal function */
-void    gtk_paned_compute_position (GtkPaned  *paned,
-                                    gint       allocation,
-                                    gint       child1_req,
-                                    gint       child2_req);
-#define        gtk_paned_gutter_size(p,s)              (void) 0
-#define        gtk_paned_set_gutter_size(p,s)          (void) 0
-#endif /* GTK_DISABLE_DEPRECATED */
 
 G_END_DECLS