gtk-css-engine r188 - in trunk: . src

[robsta svn gnome org]

Author: robsta
Date: Mon Nov 10 09:04:34 2008
New Revision: 188
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=188&view=rev

Log:
* src/gce-style.c (draw_hline), (draw_vline), (draw_shadow),
(draw_box), (draw_flat_box), (draw_check), (draw_option),
(draw_shadow_gap), (draw_box_gap), (draw_extension), (draw_slider),
(draw_handle), (draw_resize_grip), (draw_focus), (draw_expander),
(draw_diamond), (draw_arrow), (draw_tab):
Make widget role a primitive, not a class.



Modified:
   trunk/ChangeLog
   trunk/src/gce-style.c

Modified: trunk/src/gce-style.c
==============================================================================
--- trunk/src/gce-style.c	(original)
+++ trunk/src/gce-style.c	Mon Nov 10 09:04:34 2008
@@ -180,10 +180,10 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			NULL, NULL, NULL, NULL, NULL,
-			"hline");
+			role ? role : "hline");
 
 	line (self, node, window, area, widget, x1, x2, y, y);
 
@@ -208,10 +208,10 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			NULL, NULL, NULL, NULL, NULL,
-			"vline");
+			role ? role : "vline");
 
 	line (self, node, window, area, widget, x, x, y1, y2);
 
@@ -239,11 +239,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, NULL, NULL, NULL,
-			"shadow");
+			role ? role : "shadow");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -271,11 +271,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, NULL, NULL, NULL,
-			"box");
+			role ? role : "box");
 
 	rectangle (self, node, window, area, widget,
 		   x, y, width, height, TRUE);
@@ -303,11 +303,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, NULL, NULL, NULL,
-			"flatbox");
+			role ? role : "flatbox");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -335,11 +335,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, NULL, NULL, NULL,
-			"check");
+			role ? role : "check");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -367,11 +367,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, NULL, NULL, NULL,
-			"option");
+			role ? role : "option");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -402,11 +402,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, gce_maps_get_position (gap_side), NULL, NULL,
-			"shadow");
+			role ? role : "shadow");
 
 	gap (self, node, window, area, widget, 
 	     x, y, width, height, gap_side, gap_start, gap_width);
@@ -437,11 +437,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, gce_maps_get_position (gap_side), NULL, NULL,
-			"box");
+			role ? role : "box");
 
 	gap (self, node, window, area, widget, 
 	     x, y, width, height, gap_side, gap_start, gap_width);
@@ -471,11 +471,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget, 
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, gce_maps_get_position (gap_side), NULL, NULL,
-			"extension");
+			role ? role : "extension");
 
 	switch (gap_side) {
 	case GTK_POS_LEFT:
@@ -515,12 +515,12 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			gce_maps_get_orientation (orientation),
 			NULL, NULL, NULL,
-			"slider");
+			role ? role : "slider");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -549,12 +549,12 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			gce_maps_get_orientation (orientation),
 			NULL, NULL, NULL,
-			"handle");
+			role ? role : "handle");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -582,10 +582,10 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			NULL, NULL, NULL, gce_maps_get_window_edge (edge), NULL,
-			"resizegrip");
+			role ? role : "resizegrip");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -612,10 +612,10 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			NULL, NULL, NULL, NULL, NULL,
-			"focus");
+			role ? role : "focus");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, FALSE);
@@ -653,10 +653,10 @@
 	}
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			NULL, NULL, NULL, NULL, gce_maps_get_expander_style (style),
-			"expander");
+			role ? role : "expander");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, expander_size, expander_size, TRUE);
@@ -685,11 +685,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, NULL, NULL, NULL,
-			"diamond");
+			role ? role : "diamond");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -722,12 +722,12 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			gce_maps_get_arrow (arrow),
 			NULL, NULL, NULL,
-			"arrow");
+			role ? role : "arrow");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);
@@ -755,11 +755,11 @@
 	detail = gce_maps_get_detail (detail);
 
 	node = gce_node_cache_fetch_node (widget,
-			role ? role : detail,
+			detail,
 			gce_maps_get_state (state),
 			gce_maps_get_shadow (shadow),
 			NULL, NULL, NULL, NULL,
-			"tab");
+			role ? role : "tab");
 
 	rectangle (self, node, window, area, widget, 
 		   x, y, width, height, TRUE);