GNOME.org
 

[gtk-engines/gnome3] GTK_WIDGET_STATE -> gtk_widget_get_state

commit 0deeee9ee88f4465444206c13ddc2ac52a4f49c8
Author: Bastien Nocera <hadess hadess net>
Date:   Wed May 12 16:25:05 2010 +0100

    GTK_WIDGET_STATE -> gtk_widget_get_state

 engines/clearlooks/src/clearlooks_style.c |    4 ++--
 engines/clearlooks/src/support.c          |    2 +-
 engines/crux/src/crux-draw.c              |    4 ++--
 engines/glide/src/glide_gtk2_drawing.c    |    2 +-
 engines/glide/src/glide_gtk2_support.c    |    4 ++--
 engines/hc/src/hc-style.c                 |    2 +-
 engines/hc/src/hc_gtk2_support.c          |    4 ++--
 engines/lua/src/lua_style.c               |    2 +-
 engines/redmond/src/redmond_gtk2_misc.c   |    4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/engines/clearlooks/src/clearlooks_style.c b/engines/clearlooks/src/clearlooks_style.c
index 62d0f8a..a045153 100644
--- a/engines/clearlooks/src/clearlooks_style.c
+++ b/engines/clearlooks/src/clearlooks_style.c
@@ -188,7 +188,7 @@ clearlooks_style_draw_shadow (DRAW_ARGS)
 		/* Override the entries state type, because we are too lame to handle this via
 		 * the focus ring, and GtkEntry doesn't even set the INSENSITIVE state ... */
 		if (state_type == GTK_STATE_NORMAL && widget && GE_IS_ENTRY (widget))
-			state_type = GTK_WIDGET_STATE (widget);
+			state_type = gtk_widget_get_state (widget);
 
 		clearlooks_set_widget_parameters (widget, style, state_type, &params);
 
@@ -678,7 +678,7 @@ clearlooks_style_draw_box (DRAW_ARGS)
 		/* The "spinbutton" box is always drawn with state NORMAL, even if it is insensitive.
 		 * So work around this here. */
 		if (state_type == GTK_STATE_NORMAL && widget && GE_IS_ENTRY (widget))
-			state_type = GTK_WIDGET_STATE (widget);
+			state_type = gtk_widget_get_state (widget);
 
 		clearlooks_set_widget_parameters (widget, style, state_type, &params);
 
diff --git a/engines/clearlooks/src/support.c b/engines/clearlooks/src/support.c
index be23783..81d16f0 100644
--- a/engines/clearlooks/src/support.c
+++ b/engines/clearlooks/src/support.c
@@ -84,7 +84,7 @@ clearlooks_get_parent_bg (const GtkWidget *widget, CairoColor *color)
 	if (parent == NULL)
 		return;
 	
-	state_type = GTK_WIDGET_STATE (parent);
+	state_type = gtk_widget_get_state (parent);
 	
 	gcolor = &parent->style->bg[state_type];
 	
diff --git a/engines/crux/src/crux-draw.c b/engines/crux/src/crux-draw.c
index dae191f..457158f 100644
--- a/engines/crux/src/crux-draw.c
+++ b/engines/crux/src/crux-draw.c
@@ -893,7 +893,7 @@ draw_box (GtkStyle *style,
 	{
 		gboolean focused = FALSE;
 		if (widget) {
-			state_type = GTK_WIDGET_STATE (widget);
+			state_type = gtk_widget_get_state (widget);
 			focused = gtk_widget_has_focus (widget);
 		}
 		width += 3;
@@ -946,7 +946,7 @@ draw_box (GtkStyle *style,
 			if ((entry = g_object_get_data ((GObject*) widget->parent, "entry")))
 			{
 				entry_focused = (gtk_widget_has_focus (entry));
-				state_type = GTK_WIDGET_STATE (entry);
+				state_type = gtk_widget_get_state (entry);
 			}
 
 			if (state_type == GTK_STATE_INSENSITIVE)
diff --git a/engines/glide/src/glide_gtk2_drawing.c b/engines/glide/src/glide_gtk2_drawing.c
index 7e4c6c5..e671567 100644
--- a/engines/glide/src/glide_gtk2_drawing.c
+++ b/engines/glide/src/glide_gtk2_drawing.c
@@ -942,7 +942,7 @@ glide_draw_spinbutton_stepper (GtkStyle * style,
    * more complicated because we can only do half for each stepper.
    */
  
-  GtkStateType parent_state = widget ? GTK_WIDGET_STATE(widget) : GTK_STATE_NORMAL;
+  GtkStateType parent_state = widget ? gtk_widget_get_state (widget) : GTK_STATE_NORMAL;
   gboolean entry_focused = FALSE;
   gint focus_line_width = 0, focus_padding = 0, focus = 0, thick = 2;
   gboolean interior_focus = TRUE;
diff --git a/engines/glide/src/glide_gtk2_support.c b/engines/glide/src/glide_gtk2_support.c
index 1ca6125..f22ddda 100644
--- a/engines/glide/src/glide_gtk2_support.c
+++ b/engines/glide/src/glide_gtk2_support.c
@@ -1124,7 +1124,7 @@ glide_gtk2_engine_hack_menu_shell_motion(GtkWidget *widget,
           for (child = g_list_first(children); child; child = g_list_next(child))
             {
 	      if ((child->data) && GE_IS_WIDGET(child->data) && 
-                  (GTK_WIDGET_STATE(GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
+                  (gtk_widget_get_state (GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
 	        {
 	          if ((pointer_x >= GTK_WIDGET(child->data)->allocation.x) && 
 	              (pointer_y >= GTK_WIDGET(child->data)->allocation.y) &&
@@ -1172,7 +1172,7 @@ glide_gtk2_engine_hack_menu_shell_leave(GtkWidget *widget,
           for (child = g_list_first(children); child; child = g_list_next(child))
             {
 	      if ((child->data) && GE_IS_MENU_ITEM(child->data) && 
-                  (GTK_WIDGET_STATE(GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
+                  (gtk_widget_get_state (GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
 	        {
                   if ((!GE_IS_MENU(GTK_MENU_ITEM(child->data)->submenu)) || 
                       (!(GTK_WIDGET_REALIZED(GTK_MENU_ITEM(child->data)->submenu) && 
diff --git a/engines/hc/src/hc-style.c b/engines/hc/src/hc-style.c
index f89c536..a34bbc1 100644
--- a/engines/hc/src/hc-style.c
+++ b/engines/hc/src/hc-style.c
@@ -134,7 +134,7 @@ hc_draw_shadow(GtkStyle * style,
 		if ((widget) && (widget->parent))
 		{
 			gtk_widget_ensure_style(widget->parent);
-			ge_gdk_color_to_cairo(&widget->parent->style->fg[GTK_WIDGET_STATE(widget)], &foreground);
+			ge_gdk_color_to_cairo(&widget->parent->style->fg[gtk_widget_get_state (widget)], &foreground);
 		}
 	}
 
diff --git a/engines/hc/src/hc_gtk2_support.c b/engines/hc/src/hc_gtk2_support.c
index 78081e8..8348852 100644
--- a/engines/hc/src/hc_gtk2_support.c
+++ b/engines/hc/src/hc_gtk2_support.c
@@ -344,7 +344,7 @@ hc_gtk2_engine_hack_menu_shell_motion(GtkWidget *widget,
           for (child = g_list_first(children); child; child = g_list_next(child))
             {
 	      if ((child->data) && GE_IS_WIDGET(child->data) && 
-                  (GTK_WIDGET_STATE(GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
+                  (gtk_widget_get_state (GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
 	        {
 	          if ((pointer_x >= GTK_WIDGET(child->data)->allocation.x) && 
 	              (pointer_y >= GTK_WIDGET(child->data)->allocation.y) &&
@@ -392,7 +392,7 @@ hc_gtk2_engine_hack_menu_shell_leave(GtkWidget *widget,
           for (child = g_list_first(children); child; child = g_list_next(child))
             {
 	      if ((child->data) && GE_IS_MENU_ITEM(child->data) && 
-                  (GTK_WIDGET_STATE(GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
+                  (gtk_widget_get_state (GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
 	        {
                   if ((!GE_IS_MENU(GTK_MENU_ITEM(child->data)->submenu)) || 
                       (!(GTK_WIDGET_REALIZED(GTK_MENU_ITEM(child->data)->submenu) && 
diff --git a/engines/lua/src/lua_style.c b/engines/lua/src/lua_style.c
index 6fe6713..46894ba 100644
--- a/engines/lua/src/lua_style.c
+++ b/engines/lua/src/lua_style.c
@@ -112,7 +112,7 @@ lua_style_push_widget_params (LuaStyle *style, GtkWidget *widget, GtkStateType s
 		lua_newtable (style->L);
 	
 	if (widget && GE_IS_ENTRY (widget))
-		state_type = GTK_WIDGET_STATE (widget);
+		state_type = gtk_widget_get_state (widget);
 
 	lua_pushstring (style->L, get_name_for_state (state_type));
 	lua_setfield (style->L, -2, "state");
diff --git a/engines/redmond/src/redmond_gtk2_misc.c b/engines/redmond/src/redmond_gtk2_misc.c
index d60a075..bf257ce 100644
--- a/engines/redmond/src/redmond_gtk2_misc.c
+++ b/engines/redmond/src/redmond_gtk2_misc.c
@@ -451,7 +451,7 @@ redmond_gtk2_engine_hack_menu_shell_motion(GtkWidget *widget,
           for (child = g_list_first(children); child; child = g_list_next(child))
             {
 	      if ((child->data) && GE_IS_WIDGET(child->data) && 
-                  (GTK_WIDGET_STATE(GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
+                  (gtk_widget_get_state (GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
 	        {
 	          if ((pointer_x >= GTK_WIDGET(child->data)->allocation.x) && 
 	              (pointer_y >= GTK_WIDGET(child->data)->allocation.y) &&
@@ -499,7 +499,7 @@ redmond_gtk2_engine_hack_menu_shell_leave(GtkWidget *widget,
           for (child = g_list_first(children); child; child = g_list_next(child))
             {
 	      if ((child->data) && GE_IS_MENU_ITEM(child->data) && 
-                  (GTK_WIDGET_STATE(GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
+                  (gtk_widget_get_state (GTK_WIDGET(child->data)) != GTK_STATE_INSENSITIVE))
 	        {
                   if ((!GE_IS_MENU(GTK_MENU_ITEM(child->data)->submenu)) || 
                       (!(GTK_WIDGET_REALIZED(GTK_MENU_ITEM(child->data)->submenu) &&
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]