Deprecated GtkNotebook tab packing

https://bugzilla.gnome.org/show_bug.cgi?id=596083

diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index d7ca51081f04ed0d6b0feaf7315ccc4d86a8352f..0dc90496af88d6112e4c31ad7dfd5e5972e2250a 100644 (file)
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -256,7 +256,8 @@ Emitted when the user or a function changes the current page.
 
 <!-- ##### ARG GtkNotebook:tab-pack ##### -->
 <para>
-
+ Deprecated: 2.20: The tab packing functionality of children should not
+ be used anymore and support will be removed in the future.
 </para>
 
 <!-- ##### ARG GtkNotebook:arrow-spacing ##### -->

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index a32855e5e4664b8c6d63d84ff325e12c3959e085..8f19b5d5e466b180dda2ec5c2ee8350cf67f43c6 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2634,7 +2634,9 @@ gtk_notebook_popup_enable
 gtk_notebook_prepend_page
 gtk_notebook_prepend_page_menu
 gtk_notebook_prev_page
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_notebook_query_tab_label_packing
+#endif
 gtk_notebook_remove_page
 gtk_notebook_reorder_child
 gtk_notebook_set_current_page
@@ -2650,7 +2652,9 @@ gtk_notebook_set_scrollable
 gtk_notebook_set_show_border
 gtk_notebook_set_show_tabs
 gtk_notebook_set_tab_label
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_notebook_set_tab_label_packing
+#endif
 gtk_notebook_set_tab_label_text
 gtk_notebook_set_tab_pos
 gtk_notebook_set_window_creation_hook

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 2c6a507a4c55daab6640bf7869a77c695a75c087..e42e2fa7dc97829b35e2850ac32471f10317e05b 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -7198,6 +7198,8 @@ gtk_notebook_child_reordered (GtkNotebook     *notebook,
  * Sets the packing parameters for the tab label of the page
  * containing @child. See gtk_box_pack_start() for the exact meaning
  * of the parameters.
+ *
+ * Deprecated: 2.20: Modify the "expand" and "fill" child properties instead.
  **/
 void
 gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
@@ -7249,6 +7251,8 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
  * 
  * Query the packing attributes for the tab label of the page
  * containing @child.
+ *
+ * Deprecated: 2.20: Modify the "expand" and "fill" child properties instead.
  **/
 void
 gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,

diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 0659cc92d2fc9e2c9e94f8b9a510de8d39279492..41bbe66979b1ca673ccd9743b7fc8e8563619b27 100644 (file)
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -261,6 +261,7 @@ void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
                                           const gchar *menu_text);
 G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
                                                        GtkWidget   *child);
+#ifndef GTK_DISABLE_DEPRECATED
 void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           gboolean    *expand,
@@ -271,6 +272,7 @@ void gtk_notebook_set_tab_label_packing   (GtkNotebook *notebook,
                                           gboolean     expand,
                                           gboolean     fill,
                                           GtkPackType  pack_type);
+#endif
 void gtk_notebook_reorder_child           (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           gint         position);