AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-30 15:31:34 +00:00
Code Issues Projects Releases Wiki Activity

assistant: Work around deprecation warnings

Browse Source
This commit is contained in:
Benjamin Otte 2011-11-08 04:56:36 +01:00
parent 70f87b8bd5
commit a9134de5d3
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gtk/gtkassistant.c
View File

@ -167,6 +167,12 @@ static void gtk_assistant_buildable_custom_finished (GtkBuildable *bui
static GList* find_page (GtkAssistant *assistant, static GList* find_page (GtkAssistant *assistant,
GtkWidget *page); 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);
GType _gtk_assistant_accessible_get_type (void); GType _gtk_assistant_accessible_get_type (void);
@ -1093,11 +1099,11 @@ gtk_assistant_set_child_property (GtkContainer *container,
g_value_get_string (value)); g_value_get_string (value));
break; break;
case CHILD_PROP_PAGE_HEADER_IMAGE: case CHILD_PROP_PAGE_HEADER_IMAGE:
gtk_assistant_set_page_header_image (GTK_ASSISTANT (container), child, gtk_assistant_do_set_page_header_image (GTK_ASSISTANT (container), child,
g_value_get_object (value)); g_value_get_object (value));
break; break;
case CHILD_PROP_PAGE_SIDEBAR_IMAGE: case CHILD_PROP_PAGE_SIDEBAR_IMAGE:
gtk_assistant_set_page_side_image (GTK_ASSISTANT (container), child, gtk_assistant_do_set_page_side_image (GTK_ASSISTANT (container), child,
g_value_get_object (value)); g_value_get_object (value));
break; break;
case CHILD_PROP_PAGE_COMPLETE: case CHILD_PROP_PAGE_COMPLETE:
@ -1117,27 +1123,29 @@ gtk_assistant_get_child_property (GtkContainer *container,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkAssistant *assistant = GTK_ASSISTANT (container);
switch (property_id) switch (property_id)
{ {
case CHILD_PROP_PAGE_TYPE: case CHILD_PROP_PAGE_TYPE:
g_value_set_enum (value, g_value_set_enum (value,
gtk_assistant_get_page_type (GTK_ASSISTANT (container), child)); gtk_assistant_get_page_type (assistant, child));
break; break;
case CHILD_PROP_PAGE_TITLE: case CHILD_PROP_PAGE_TITLE:
g_value_set_string (value, g_value_set_string (value,
gtk_assistant_get_page_title (GTK_ASSISTANT (container), child)); gtk_assistant_get_page_title (assistant, child));
break; break;
case CHILD_PROP_PAGE_HEADER_IMAGE: case CHILD_PROP_PAGE_HEADER_IMAGE:
g_value_set_object (value, g_value_set_object (value,
gtk_assistant_get_page_header_image (GTK_ASSISTANT (container), child)); ((GtkAssistantPage*) find_page (assistant, child))->header_image);
break; break;
case CHILD_PROP_PAGE_SIDEBAR_IMAGE: case CHILD_PROP_PAGE_SIDEBAR_IMAGE:
g_value_set_object (value, g_value_set_object (value,
gtk_assistant_get_page_side_image (GTK_ASSISTANT (container), child)); ((GtkAssistantPage*) find_page (assistant, child))->sidebar_image);
break; break;
case CHILD_PROP_PAGE_COMPLETE: case CHILD_PROP_PAGE_COMPLETE:
g_value_set_boolean (value, g_value_set_boolean (value,
gtk_assistant_get_page_complete (GTK_ASSISTANT (container), child)); gtk_assistant_get_page_complete (assistant, child));
break; break;
default: default:
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
@ -1969,13 +1977,21 @@ gtk_assistant_set_page_header_image (GtkAssistant *assistant,
GtkWidget *page, GtkWidget *page,
GdkPixbuf *pixbuf) GdkPixbuf *pixbuf)
{ {
GtkAssistantPage *page_info;
GList *child;
g_return_if_fail (GTK_IS_ASSISTANT (assistant)); g_return_if_fail (GTK_IS_ASSISTANT (assistant));
g_return_if_fail (GTK_IS_WIDGET (page)); g_return_if_fail (GTK_IS_WIDGET (page));
g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); 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); child = find_page (assistant, page);
g_return_if_fail (child != NULL); g_return_if_fail (child != NULL);
@ -2052,13 +2068,21 @@ gtk_assistant_set_page_side_image (GtkAssistant *assistant,
GtkWidget *page, GtkWidget *page,
GdkPixbuf *pixbuf) GdkPixbuf *pixbuf)
{ {
GtkAssistantPage *page_info;
GList *child;
g_return_if_fail (GTK_IS_ASSISTANT (assistant)); g_return_if_fail (GTK_IS_ASSISTANT (assistant));
g_return_if_fail (GTK_IS_WIDGET (page)); g_return_if_fail (GTK_IS_WIDGET (page));
g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); 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); child = find_page (assistant, page);
g_return_if_fail (child != NULL); g_return_if_fail (child != NULL);