Remove deprecated notebook api

This commit is contained in:
Matthias Clasen 2010-06-26 16:29:43 -04:00
parent 4601ad2352
commit 67cd929267
4 changed files with 20 additions and 61 deletions

View File

@ -2220,11 +2220,9 @@ gtk_notebook_get_menu_label
gtk_notebook_get_nth_page gtk_notebook_get_nth_page
gtk_notebook_get_n_pages gtk_notebook_get_n_pages
gtk_notebook_get_tab_label gtk_notebook_get_tab_label
gtk_notebook_query_tab_label_packing
gtk_notebook_set_menu_label gtk_notebook_set_menu_label
gtk_notebook_set_menu_label_text gtk_notebook_set_menu_label_text
gtk_notebook_set_tab_label gtk_notebook_set_tab_label
gtk_notebook_set_tab_label_packing
gtk_notebook_set_tab_label_text gtk_notebook_set_tab_label_text
gtk_notebook_set_tab_reorderable gtk_notebook_set_tab_reorderable
gtk_notebook_set_tab_detachable gtk_notebook_set_tab_detachable

View File

@ -2161,9 +2161,6 @@ gtk_notebook_popup_enable
gtk_notebook_prepend_page gtk_notebook_prepend_page
gtk_notebook_prepend_page_menu gtk_notebook_prepend_page_menu
gtk_notebook_prev_page gtk_notebook_prev_page
#ifndef GTK_DISABLE_DEPRECATED
gtk_notebook_query_tab_label_packing
#endif
gtk_notebook_remove_page gtk_notebook_remove_page
gtk_notebook_reorder_child gtk_notebook_reorder_child
gtk_notebook_set_current_page gtk_notebook_set_current_page
@ -2173,9 +2170,6 @@ gtk_notebook_set_scrollable
gtk_notebook_set_show_border gtk_notebook_set_show_border
gtk_notebook_set_show_tabs gtk_notebook_set_show_tabs
gtk_notebook_set_tab_label 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_label_text
gtk_notebook_set_tab_pos gtk_notebook_set_tab_pos
gtk_notebook_set_window_creation_hook gtk_notebook_set_window_creation_hook

View File

@ -228,6 +228,16 @@ static gboolean gtk_notebook_reorder_tab (GtkNotebook *notebook,
gboolean move_to_last); gboolean move_to_last);
static void gtk_notebook_remove_tab_label (GtkNotebook *notebook, static void gtk_notebook_remove_tab_label (GtkNotebook *notebook,
GtkNotebookPage *page); 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 ***/ /*** GtkObject Methods ***/
static void gtk_notebook_destroy (GtkObject *object); static void gtk_notebook_destroy (GtkObject *object);
@ -7280,29 +7290,12 @@ gtk_notebook_child_reordered (GtkNotebook *notebook,
gtk_notebook_update_labels (notebook); gtk_notebook_update_labels (notebook);
} }
/** static void
* 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
gtk_notebook_set_tab_label_packing (GtkNotebook *notebook, gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
GtkWidget *child, GtkWidget *child,
gboolean expand, gboolean expand,
gboolean fill, gboolean fill,
GtkPackType pack_type) GtkPackType pack_type)
{ {
GtkNotebookPage *page; GtkNotebookPage *page;
GList *list; GList *list;
@ -7337,26 +7330,12 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
gtk_widget_thaw_child_notify (child); gtk_widget_thaw_child_notify (child);
} }
/** static void
* 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
gtk_notebook_query_tab_label_packing (GtkNotebook *notebook, gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
GtkWidget *child, GtkWidget *child,
gboolean *expand, gboolean *expand,
gboolean *fill, gboolean *fill,
GtkPackType *pack_type) GtkPackType *pack_type)
{ {
GList *list; GList *list;

View File

@ -242,18 +242,6 @@ void gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
const gchar *menu_text); const gchar *menu_text);
G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook, G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
GtkWidget *child); 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, void gtk_notebook_reorder_child (GtkNotebook *notebook,
GtkWidget *child, GtkWidget *child,
gint position); gint position);