AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-19 00:20:09 +00:00
Code Issues Projects Releases Wiki Activity

Chain up in state_flags_changed

Browse Source 
When introducing handlers for state_flags_changed in the node
transitions, chaining up was forgotten.
This commit is contained in:
Benjamin Otte 2015-12-02 04:36:31 +01:00
parent da6beb994e
commit 3513e5e87b
8 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcolorswatch.c
View File

@ -616,6 +616,8 @@ swatch_state_flags_changed (GtkWidget *widget,
GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget); GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
gtk_css_node_set_state (swatch->priv->overlay_node, gtk_widget_get_state_flags (widget)); gtk_css_node_set_state (swatch->priv->overlay_node, gtk_widget_get_state_flags (widget));
GTK_WIDGET_CLASS (gtk_color_swatch_parent_class)->state_flags_changed (widget, previous_state);
} }
/* GObject implementation {{{1 */ /* GObject implementation {{{1 */

24
gtk/gtkfilesystem.c
View File

@ -788,22 +788,6 @@ _gtk_file_system_volume_get_symbolic_icon (GtkFileSystemVolume *volume)
return NULL; return NULL;
} }
cairo_surface_t *
_gtk_file_system_volume_render_symbolic_icon (GtkFileSystemVolume *volume,
GtkWidget *widget,
gint icon_size,
GError **error)
{
GIcon *icon;
cairo_surface_t *surface;
icon = _gtk_file_system_volume_get_symbolic_icon (volume);
surface = get_surface_from_gicon (icon, widget, icon_size, error);
g_object_unref (icon);
return surface;
}
GtkFileSystemVolume * GtkFileSystemVolume *
_gtk_file_system_volume_ref (GtkFileSystemVolume *volume) _gtk_file_system_volume_ref (GtkFileSystemVolume *volume)
{ {
@ -894,14 +878,6 @@ _gtk_file_info_render_icon (GFileInfo *info,
return _gtk_file_info_render_icon_internal (info, widget, icon_size, FALSE); return _gtk_file_info_render_icon_internal (info, widget, icon_size, FALSE);
} }
cairo_surface_t *
_gtk_file_info_render_symbolic_icon (GFileInfo *info,
GtkWidget *widget,
gint icon_size)
{
return _gtk_file_info_render_icon_internal (info, widget, icon_size, TRUE);
}
gboolean gboolean
_gtk_file_info_consider_as_directory (GFileInfo *info) _gtk_file_info_consider_as_directory (GFileInfo *info)
{ {

7
gtk/gtkfilesystem.h
View File

@ -98,10 +98,6 @@ cairo_surface_t * _gtk_file_system_volume_render_icon (GtkFileSystemVol
GtkWidget *widget, GtkWidget *widget,
gint icon_size, gint icon_size,
GError **error); GError **error);
cairo_surface_t * _gtk_file_system_volume_render_symbolic_icon (GtkFileSystemVolume *volume,
GtkWidget *widget,
gint icon_size,
GError **error);
GtkFileSystemVolume *_gtk_file_system_volume_ref (GtkFileSystemVolume *volume); GtkFileSystemVolume *_gtk_file_system_volume_ref (GtkFileSystemVolume *volume);
void _gtk_file_system_volume_unref (GtkFileSystemVolume *volume); void _gtk_file_system_volume_unref (GtkFileSystemVolume *volume);
@ -110,9 +106,6 @@ void _gtk_file_system_volume_unref (GtkFileSystemVol
cairo_surface_t * _gtk_file_info_render_icon (GFileInfo *info, cairo_surface_t * _gtk_file_info_render_icon (GFileInfo *info,
GtkWidget *widget, GtkWidget *widget,
gint icon_size); gint icon_size);
cairo_surface_t * _gtk_file_info_render_symbolic_icon (GFileInfo *info,
GtkWidget *widget,
gint icon_size);
gboolean _gtk_file_info_consider_as_directory (GFileInfo *info); gboolean _gtk_file_info_consider_as_directory (GFileInfo *info);

2
gtk/gtklevelbar.c
View File

@ -666,6 +666,8 @@ gtk_level_bar_state_flags_changed (GtkWidget *widget,
gtk_css_node_set_state (priv->trough_node, state); gtk_css_node_set_state (priv->trough_node, state);
for (i = 0; i < priv->n_blocks; i++) for (i = 0; i < priv->n_blocks; i++)
gtk_css_node_set_state (priv->block_node[i], state); gtk_css_node_set_state (priv->block_node[i], state);
GTK_WIDGET_CLASS (gtk_level_bar_parent_class)->state_flags_changed (widget, previous_state);
} }
static void static void

2
gtk/gtkmodelbutton.c
View File

@ -239,6 +239,8 @@ gtk_model_button_state_flags_changed (GtkWidget *widget,
GtkStateFlags previous_flags) GtkStateFlags previous_flags)
{ {
gtk_model_button_update_state (GTK_MODEL_BUTTON (widget)); gtk_model_button_update_state (GTK_MODEL_BUTTON (widget));
GTK_WIDGET_CLASS (gtk_model_button_parent_class)->state_flags_changed (widget, previous_flags);
} }
static void static void

2
gtk/gtkrange.c
View File

@ -1884,6 +1884,8 @@ gtk_range_state_flags_changed (GtkWidget *widget,
update_trough_state (range); update_trough_state (range);
update_slider_state (range); update_slider_state (range);
update_steppers_state (range); update_steppers_state (range);
GTK_WIDGET_CLASS (gtk_range_parent_class)->state_flags_changed (widget, previous_state);
} }
static void static void

2
gtk/gtkspinbutton.c
View File

@ -1513,6 +1513,8 @@ gtk_spin_button_state_flags_changed (GtkWidget *widget,
gtk_css_node_set_state (priv->entry_node, gtk_widget_get_state_flags (widget)); gtk_css_node_set_state (priv->entry_node, gtk_widget_get_state_flags (widget));
update_node_state (spin); update_node_state (spin);
GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->state_flags_changed (widget, previous_state);
} }
static gint static gint

2
gtk/gtkwindow.c
View File

@ -8740,6 +8740,8 @@ gtk_window_state_flags_changed (GtkWidget *widget,
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
gtk_css_node_set_state (priv->decoration_node, state); gtk_css_node_set_state (priv->decoration_node, state);
GTK_WIDGET_CLASS (gtk_window_parent_class)->state_flags_changed (widget, previous_state);
} }
static void static void