[gtk+/wip/ricotz/deprecated: 2/2] assistant: Remove deprecated API
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/ricotz/deprecated: 2/2] assistant: Remove deprecated API
- Date: Sun, 23 Oct 2016 08:28:19 +0000 (UTC)
commit 59a53580c1083f6e2317200e60d1d6c7957b1270
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sun Oct 23 10:26:56 2016 +0200
assistant: Remove deprecated API
docs/reference/gtk/gtk4-sections.txt | 4 -
gtk/gtkassistant.c | 244 ----------------------------------
gtk/gtkassistant.h | 15 --
3 files changed, 0 insertions(+), 263 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 0066e72..395bec2 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -308,10 +308,6 @@ gtk_assistant_set_page_type
gtk_assistant_get_page_type
gtk_assistant_set_page_title
gtk_assistant_get_page_title
-gtk_assistant_set_page_header_image
-gtk_assistant_get_page_header_image
-gtk_assistant_set_page_side_image
-gtk_assistant_get_page_side_image
gtk_assistant_set_page_complete
gtk_assistant_get_page_complete
gtk_assistant_set_page_has_padding
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index de8a242..eb9eea7 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -96,8 +96,6 @@ struct _GtkAssistantPage
GtkWidget *page;
GtkWidget *regular_title;
GtkWidget *current_title;
- GdkPixbuf *header_image;
- GdkPixbuf *sidebar_image;
};
struct _GtkAssistantPrivate
@@ -167,12 +165,6 @@ static void gtk_assistant_buildable_custom_finished (GtkBuildable *bui
static GList* find_page (GtkAssistant *assistant,
GtkWidget *page);
-static void gtk_assistant_do_set_page_header_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf);
-static void gtk_assistant_do_set_page_side_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf);
static void on_assistant_close (GtkWidget *widget,
GtkAssistant *assistant);
@@ -197,8 +189,6 @@ enum
CHILD_PROP_0,
CHILD_PROP_PAGE_TYPE,
CHILD_PROP_PAGE_TITLE,
- CHILD_PROP_PAGE_HEADER_IMAGE,
- CHILD_PROP_PAGE_SIDEBAR_IMAGE,
CHILD_PROP_PAGE_COMPLETE,
CHILD_PROP_HAS_PADDING
};
@@ -557,41 +547,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
GTK_PARAM_READWRITE));
/**
- * GtkAssistant:header-image:
- *
- * This image used to be displayed in the page header.
- *
- * Since: 2.10
- *
- * Deprecated: 3.2: Since GTK+ 3.2, a header is no longer shown;
- * add your header decoration to the page content instead.
- */
- gtk_container_class_install_child_property (container_class,
- CHILD_PROP_PAGE_HEADER_IMAGE,
- g_param_spec_object ("header-image",
- P_("Header image"),
- P_("Header image for the assistant page"),
- GDK_TYPE_PIXBUF,
- GTK_PARAM_READWRITE));
-
- /**
- * GtkAssistant:sidebar-image:
- *
- * This image used to be displayed in the 'sidebar'.
- *
- * Since: 2.10
- *
- * Deprecated: 3.2: Since GTK+ 3.2, the sidebar image is no longer shown.
- */
- gtk_container_class_install_child_property (container_class,
- CHILD_PROP_PAGE_SIDEBAR_IMAGE,
- g_param_spec_object ("sidebar-image",
- P_("Sidebar image"),
- P_("Sidebar image for the assistant
page"),
- GDK_TYPE_PIXBUF,
- GTK_PARAM_READWRITE));
-
- /**
* GtkAssistant:complete:
*
* Setting the "complete" child property to %TRUE marks a page as
@@ -1213,14 +1168,6 @@ gtk_assistant_set_child_property (GtkContainer *container,
gtk_assistant_set_page_title (GTK_ASSISTANT (container), child,
g_value_get_string (value));
break;
- case CHILD_PROP_PAGE_HEADER_IMAGE:
- gtk_assistant_do_set_page_header_image (GTK_ASSISTANT (container), child,
- g_value_get_object (value));
- break;
- case CHILD_PROP_PAGE_SIDEBAR_IMAGE:
- gtk_assistant_do_set_page_side_image (GTK_ASSISTANT (container), child,
- g_value_get_object (value));
- break;
case CHILD_PROP_PAGE_COMPLETE:
gtk_assistant_set_page_complete (GTK_ASSISTANT (container), child,
g_value_get_boolean (value));
@@ -1254,18 +1201,6 @@ gtk_assistant_get_child_property (GtkContainer *container,
g_value_set_string (value,
gtk_assistant_get_page_title (assistant, child));
break;
- case CHILD_PROP_PAGE_HEADER_IMAGE:
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_value_set_object (value,
- gtk_assistant_get_page_header_image (assistant, child));
-G_GNUC_END_IGNORE_DEPRECATIONS
- break;
- case CHILD_PROP_PAGE_SIDEBAR_IMAGE:
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- g_value_set_object (value,
- gtk_assistant_get_page_side_image (assistant, child));
-G_GNUC_END_IGNORE_DEPRECATIONS
- break;
case CHILD_PROP_PAGE_COMPLETE:
g_value_set_boolean (value,
gtk_assistant_get_page_complete (assistant, child));
@@ -2119,185 +2054,6 @@ gtk_assistant_get_page_type (GtkAssistant *assistant,
}
/**
- * gtk_assistant_set_page_header_image:
- * @assistant: a #GtkAssistant
- * @page: a page of @assistant
- * @pixbuf: (allow-none): the new header image @page
- *
- * Sets a header image for @page.
- *
- * Since: 2.10
- *
- * Deprecated: 3.2: Since GTK+ 3.2, a header is no longer shown;
- * add your header decoration to the page content instead.
- */
-void
-gtk_assistant_set_page_header_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf)
-{
- g_return_if_fail (GTK_IS_ASSISTANT (assistant));
- g_return_if_fail (GTK_IS_WIDGET (page));
- g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
-
- gtk_assistant_do_set_page_header_image (assistant, page, pixbuf);
-}
-
-static void
-gtk_assistant_do_set_page_header_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf)
-{
- GtkAssistantPage *page_info;
- GList *child;
-
- child = find_page (assistant, page);
-
- g_return_if_fail (child != NULL);
-
- page_info = (GtkAssistantPage*) child->data;
-
- if (pixbuf != page_info->header_image)
- {
- if (page_info->header_image)
- {
- g_object_unref (page_info->header_image);
- page_info->header_image = NULL;
- }
-
- if (pixbuf)
- page_info->header_image = g_object_ref (pixbuf);
-
- gtk_container_child_notify (GTK_CONTAINER (assistant), page, "header-image");
- }
-}
-
-/**
- * gtk_assistant_get_page_header_image:
- * @assistant: a #GtkAssistant
- * @page: a page of @assistant
- *
- * Gets the header image for @page.
- *
- * Returns: (transfer none): the header image for @page,
- * or %NULL if there’s no header image for the page
- *
- * Since: 2.10
- *
- * Deprecated: 3.2: Since GTK+ 3.2, a header is no longer shown;
- * add your header decoration to the page content instead.
- */
-GdkPixbuf*
-gtk_assistant_get_page_header_image (GtkAssistant *assistant,
- GtkWidget *page)
-{
- GtkAssistantPage *page_info;
- GList *child;
-
- g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
- g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
-
- child = find_page (assistant, page);
-
- g_return_val_if_fail (child != NULL, NULL);
-
- page_info = (GtkAssistantPage*) child->data;
-
- return page_info->header_image;
-}
-
-/**
- * gtk_assistant_set_page_side_image:
- * @assistant: a #GtkAssistant
- * @page: a page of @assistant
- * @pixbuf: (allow-none): the new side image @page
- *
- * Sets a side image for @page.
- *
- * This image used to be displayed in the side area of the assistant
- * when @page is the current page.
- *
- * Since: 2.10
- *
- * Deprecated: 3.2: Since GTK+ 3.2, sidebar images are not
- * shown anymore.
- */
-void
-gtk_assistant_set_page_side_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf)
-{
- g_return_if_fail (GTK_IS_ASSISTANT (assistant));
- g_return_if_fail (GTK_IS_WIDGET (page));
- g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
-
- gtk_assistant_do_set_page_side_image (assistant, page, pixbuf);
-}
-
-static void
-gtk_assistant_do_set_page_side_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf)
-{
- GtkAssistantPage *page_info;
- GList *child;
-
- child = find_page (assistant, page);
-
- g_return_if_fail (child != NULL);
-
- page_info = (GtkAssistantPage*) child->data;
-
- if (pixbuf != page_info->sidebar_image)
- {
- if (page_info->sidebar_image)
- {
- g_object_unref (page_info->sidebar_image);
- page_info->sidebar_image = NULL;
- }
-
- if (pixbuf)
- page_info->sidebar_image = g_object_ref (pixbuf);
-
- gtk_container_child_notify (GTK_CONTAINER (assistant), page, "sidebar-image");
- }
-}
-
-/**
- * gtk_assistant_get_page_side_image:
- * @assistant: a #GtkAssistant
- * @page: a page of @assistant
- *
- * Gets the side image for @page.
- *
- * Returns: (transfer none): the side image for @page,
- * or %NULL if there’s no side image for the page
- *
- * Since: 2.10
- *
- * Deprecated: 3.2: Since GTK+ 3.2, sidebar images are not
- * shown anymore.
- */
-GdkPixbuf*
-gtk_assistant_get_page_side_image (GtkAssistant *assistant,
- GtkWidget *page)
-{
- GtkAssistantPage *page_info;
- GList *child;
-
- g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
- g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
-
- child = find_page (assistant, page);
-
- g_return_val_if_fail (child != NULL, NULL);
-
- page_info = (GtkAssistantPage*) child->data;
-
- return page_info->sidebar_image;
-}
-
-/**
* gtk_assistant_set_page_complete:
* @assistant: a #GtkAssistant
* @page: a page of @assistant
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 06dfbf8..933a75d 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -183,21 +183,6 @@ GDK_AVAILABLE_IN_ALL
const gchar * gtk_assistant_get_page_title (GtkAssistant *assistant,
GtkWidget *page);
-GDK_DEPRECATED_IN_3_2
-void gtk_assistant_set_page_header_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf);
-GDK_DEPRECATED_IN_3_2
-GdkPixbuf *gtk_assistant_get_page_header_image (GtkAssistant *assistant,
- GtkWidget *page);
-GDK_DEPRECATED_IN_3_2
-void gtk_assistant_set_page_side_image (GtkAssistant *assistant,
- GtkWidget *page,
- GdkPixbuf *pixbuf);
-GDK_DEPRECATED_IN_3_2
-GdkPixbuf *gtk_assistant_get_page_side_image (GtkAssistant *assistant,
- GtkWidget *page);
-
GDK_AVAILABLE_IN_ALL
void gtk_assistant_set_page_complete (GtkAssistant *assistant,
GtkWidget *page,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
