Adapt gtk_icon_info_load_symbolic to librsvg limitations too

[~andy/gtk] / gtk / gtkentry.c

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index bb207310f1db920d25e7bcc46f6197487ab8eb33..880db8971662a7ffb9fab64c13c96256b93042d0 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3506,6 +3506,9 @@ gtk_entry_draw (GtkWidget *widget,
   if (gtk_widget_has_focus (widget))
     state |= GTK_STATE_FLAG_FOCUSED;
 
+  gtk_style_context_save (context);
+  gtk_style_context_set_state (context, state);
+
   if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
     {
       /* Draw entry_bg, shadow, progress and focus */
@@ -3547,6 +3550,8 @@ gtk_entry_draw (GtkWidget *widget,
         }
     }
 
+  gtk_style_context_restore (context);
+
   return FALSE;
 }
 
@@ -6809,7 +6814,7 @@ gtk_entry_set_buffer (GtkEntry       *entry,
 /**
  * gtk_entry_get_text_area:
  * @entry: a #GtkEntry
- * @text_area: Return location for the text area.
+ * @text_area: (out): Return location for the text area.
  *
  * Gets the area where the entry's text is drawn. This function is
  * useful when drawing something to the entry in a draw callback.
@@ -7480,8 +7485,8 @@ gtk_entry_text_index_to_layout_index (GtkEntry *entry,
 /**
  * gtk_entry_get_layout_offsets:
  * @entry: a #GtkEntry
- * @x: (allow-none): location to store X offset of layout, or %NULL
- * @y: (allow-none): location to store Y offset of layout, or %NULL
+ * @x: (out) (allow-none): location to store X offset of layout, or %NULL
+ * @y: (out) (allow-none): location to store Y offset of layout, or %NULL
  *
  *
  * Obtains the position of the #PangoLayout used to render text
@@ -8288,7 +8293,7 @@ gtk_entry_get_current_icon_drag_source (GtkEntry *entry)
  * gtk_entry_get_icon_area:
  * @entry: A #GtkEntry
  * @icon_pos: Icon position
- * @icon_area: Return location for the icon's area
+ * @icon_area: (out): Return location for the icon's area
  *
  * Gets the area where entry's icon at @icon_pos is drawn.
  * This function is useful when drawing something to the