From 67cd9292675bc844bee0355a3c11b0c88da9c8e5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 26 Jun 2010 16:29:43 -0400 Subject: [PATCH] Remove deprecated notebook api --- docs/reference/gtk/gtk3-sections.txt | 2 - gtk/gtk.symbols | 6 --- gtk/gtknotebook.c | 61 +++++++++------------------- gtk/gtknotebook.h | 12 ------ 4 files changed, 20 insertions(+), 61 deletions(-) diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index 21dc9d1d8..66d4c8c62 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -2220,11 +2220,9 @@ gtk_notebook_get_menu_label gtk_notebook_get_nth_page gtk_notebook_get_n_pages gtk_notebook_get_tab_label -gtk_notebook_query_tab_label_packing gtk_notebook_set_menu_label gtk_notebook_set_menu_label_text gtk_notebook_set_tab_label -gtk_notebook_set_tab_label_packing gtk_notebook_set_tab_label_text gtk_notebook_set_tab_reorderable gtk_notebook_set_tab_detachable diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index e21646846..16497e797 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2161,9 +2161,6 @@ 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 @@ -2173,9 +2170,6 @@ 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 bb528fdf0..3b5e1b8d1 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -228,6 +228,16 @@ static gboolean gtk_notebook_reorder_tab (GtkNotebook *notebook, gboolean move_to_last); static void gtk_notebook_remove_tab_label (GtkNotebook *notebook, GtkNotebookPage *page); +static void gtk_notebook_set_tab_label_packing (GtkNotebook *notebook, + GtkWidget *child, + gboolean expand, + gboolean fill, + GtkPackType pack_type); +static void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook, + GtkWidget *child, + gboolean *expand, + gboolean *fill, + GtkPackType *pack_type); /*** GtkObject Methods ***/ static void gtk_notebook_destroy (GtkObject *object); @@ -7280,29 +7290,12 @@ gtk_notebook_child_reordered (GtkNotebook *notebook, gtk_notebook_update_labels (notebook); } -/** - * gtk_notebook_set_tab_label_packing: - * @notebook: a #GtkNotebook - * @child: the child widget - * @expand: whether to expand the tab label or not - * @fill: whether the tab label should fill the allocated area or not - * @pack_type: the position of the tab label - * - * 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 #GtkNotebook:tab-expand and - * #GtkNotebook:tab-fill child properties instead. - * Modifying the packing of the tab label is a deprecated feature and - * shouldn't be done anymore. - **/ -void +static void gtk_notebook_set_tab_label_packing (GtkNotebook *notebook, - GtkWidget *child, - gboolean expand, - gboolean fill, - GtkPackType pack_type) + GtkWidget *child, + gboolean expand, + gboolean fill, + GtkPackType pack_type) { GtkNotebookPage *page; GList *list; @@ -7337,26 +7330,12 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook, gtk_widget_thaw_child_notify (child); } -/** - * gtk_notebook_query_tab_label_packing: - * @notebook: a #GtkNotebook - * @child: the page - * @expand: location to store the expand value (or NULL) - * @fill: location to store the fill value (or NULL) - * @pack_type: location to store the pack_type (or NULL) - * - * Query the packing attributes for the tab label of the page - * containing @child. - * - * Deprecated: 2.20: Modify the #GtkNotebook:tab-expand and - * #GtkNotebook:tab-fill child properties instead. - **/ -void +static void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook, - GtkWidget *child, - gboolean *expand, - gboolean *fill, - GtkPackType *pack_type) + GtkWidget *child, + gboolean *expand, + gboolean *fill, + GtkPackType *pack_type) { GList *list; diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index e58bc5d2d..97128b846 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -242,18 +242,6 @@ 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, - gboolean *fill, - GtkPackType *pack_type); -void gtk_notebook_set_tab_label_packing (GtkNotebook *notebook, - GtkWidget *child, - gboolean expand, - gboolean fill, - GtkPackType pack_type); -#endif void gtk_notebook_reorder_child (GtkNotebook *notebook, GtkWidget *child, gint position); -- 2.43.2