callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change type of local "image" variable from GtkImage to GtkWidget to fix

Browse Source 
2008-06-13  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkaction.c (gtk_action_set_short_label): change type of
	local "image" variable from GtkImage to GtkWidget to fix warning.


svn path=/trunk/; revision=20373
This commit is contained in:
Michael Natterer 2008-06-13 13:40:29 +00:00 committed by Michael Natterer
parent 6aaea97378
commit 00bdd1fcce
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-13 Michael Natterer <mitch@imendio.com>
* gtk/gtkaction.c (gtk_action_set_short_label): change type of
local "image" variable from GtkImage to GtkWidget to fix warning.
2008-06-13 Michael Natterer <mitch@imendio.com>
* gtk/gtkcombobox.c (gtk_combo_box_menu_position): cast menu's

9
gtk/gtkaction.c
View File

@ -1385,19 +1385,20 @@ gtk_action_set_short_label (GtkAction *action,
proxy = (GtkWidget *)p->data;
if (GTK_IS_TOOL_BUTTON (proxy))
gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy),
gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy),
action->private_data->short_label);
else if (GTK_IS_BUTTON (proxy) &&
!gtk_button_get_use_stock (GTK_BUTTON (proxy)))
{
GtkImage *image;
GtkWidget *image;
child = GTK_BIN (proxy)->child;
image = gtk_button_get_image (GTK_BUTTON (proxy));
if (GTK_IS_IMAGE (image) ||
child == NULL || GTK_IS_LABEL (child))
gtk_button_set_label (GTK_BUTTON (proxy),
gtk_button_set_label (GTK_BUTTON (proxy),
action->private_data->short_label);
}
}