[murrine/gtk+3] Small updates to the porting of murrine_get_parent_bg



commit 8e855c6c15887850690a76839b5043b86c8357f0
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Tue Oct 12 20:07:37 2010 +0200

    Small updates to the porting of murrine_get_parent_bg

 src/cairo-support.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/cairo-support.c b/src/cairo-support.c
index 7f14787..958cb47 100644
--- a/src/cairo-support.c
+++ b/src/cairo-support.c
@@ -266,22 +266,22 @@ void
 murrine_get_parent_bg (const GtkWidget *widget, MurrineRGB *color)
 {
 	GtkStateType state_type;
-	GtkStyle *style;
 	const GtkWidget *parent;
-	GdkColor gcolor;
+	GdkColor *gcolor;
 	gboolean stop;
+	GtkStyle *style;
 
 	if (widget == NULL)
 		return;
 
-	parent = gtk_widget_get_parent(GTK_WIDGET(widget));
+	parent = gtk_widget_get_parent ((GtkWidget *) widget);
 	stop = FALSE;
 
 	while (parent && !stop)
 	{
 		stop = FALSE;
 
-		stop |= !GTK_WIDGET_NO_WINDOW (parent);
+		stop |= !gtk_widget_get_has_window ((GtkWidget *) parent);
 		stop |= GTK_IS_NOTEBOOK (parent) &&
 		        gtk_notebook_get_show_tabs (GTK_NOTEBOOK (parent)) &&
 		        gtk_notebook_get_show_border (GTK_NOTEBOOK (parent));
@@ -295,18 +295,18 @@ murrine_get_parent_bg (const GtkWidget *widget, MurrineRGB *color)
 		}
 
 		if (!stop)
-			parent = gtk_widget_get_parent(GTK_WIDGET(parent));
+			parent = gtk_widget_get_parent ((GtkWidget *) parent);
 	}
 
 	if (parent == NULL)
 		return;
 
-	state_type = GTK_WIDGET_STATE (parent);
+	state_type = gtk_widget_get_state ((GtkWidget *) parent);
 
-	style = gtk_widget_get_style(GTK_WIDGET(&parent));
-	gcolor = style->bg[state_type];
+	style = gtk_widget_get_style ((GtkWidget *) parent);
+	gcolor = &style->bg[state_type];
 
-	murrine_gdk_color_to_rgb (&gcolor, &color->r, &color->g, &color->b);
+	murrine_gdk_color_to_rgb (gcolor, &color->r, &color->g, &color->b);
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]