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

Silence compiler warnings

Browse Source
This commit is contained in:
Matthias Clasen 2011-07-03 15:33:27 -04:00
parent 5d90ca35c2
commit e1463ab57c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/a11y/gtkbuttonaccessible.c
View File

@ -276,7 +276,6 @@ static const gchar *
gtk_button_accessible_get_keybinding (AtkAction *action, gtk_button_accessible_get_keybinding (AtkAction *action,
gint i) gint i)
{ {
GtkButtonAccessible *button;
gchar *return_value = NULL; gchar *return_value = NULL;
GtkWidget *widget; GtkWidget *widget;
GtkWidget *label; GtkWidget *label;
@ -289,8 +288,6 @@ gtk_button_accessible_get_keybinding (AtkAction *action,
if (i != 0) if (i != 0)
return NULL; return NULL;
button = GTK_BUTTON_ACCESSIBLE (action);
label = get_label_from_button (widget); label = get_label_from_button (widget);
if (GTK_IS_LABEL (label)) if (GTK_IS_LABEL (label))
{ {
@ -376,7 +373,7 @@ gtk_button_accessible_get_image_position (AtkImage *image,
AtkCoordType coord_type) AtkCoordType coord_type)
{ {
GtkWidget *widget; GtkWidget *widget;
GtkImage *button_image; GtkWidget *button_image;
AtkObject *obj; AtkObject *obj;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
@ -388,10 +385,9 @@ gtk_button_accessible_get_image_position (AtkImage *image,
} }
button_image = get_image_from_button (widget); button_image = get_image_from_button (widget);
if (button_image != NULL) if (button_image != NULL)
{ {
obj = gtk_widget_get_accessible (GTK_WIDGET (button_image)); obj = gtk_widget_get_accessible (button_image);
atk_component_get_position (ATK_COMPONENT (obj), x, y, coord_type); atk_component_get_position (ATK_COMPONENT (obj), x, y, coord_type);
} }
else else
@ -407,7 +403,7 @@ gtk_button_accessible_get_image_size (AtkImage *image,
gint *height) gint *height)
{ {
GtkWidget *widget; GtkWidget *widget;
GtkImage *button_image; GtkWidget *button_image;
AtkObject *obj; AtkObject *obj;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
@ -419,8 +415,7 @@ gtk_button_accessible_get_image_size (AtkImage *image,
} }
button_image = get_image_from_button (widget); button_image = get_image_from_button (widget);
if (GTK_IS_IMAGE (button_image))
if (button_image != NULL)
{ {
obj = gtk_widget_get_accessible (GTK_WIDGET (button_image)); obj = gtk_widget_get_accessible (GTK_WIDGET (button_image));
atk_image_get_image_size (ATK_IMAGE (obj), width, height); atk_image_get_image_size (ATK_IMAGE (obj), width, height);
@ -437,7 +432,7 @@ gtk_button_accessible_set_image_description (AtkImage *image,
const gchar *description) const gchar *description)
{ {
GtkWidget *widget; GtkWidget *widget;
GtkImage *button_image; GtkWidget *button_image;
AtkObject *obj; AtkObject *obj;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
@ -446,8 +441,7 @@ gtk_button_accessible_set_image_description (AtkImage *image,
return FALSE; return FALSE;
button_image = get_image_from_button (widget); button_image = get_image_from_button (widget);
if (GTK_IMAGE (button_image))
if (button_image != NULL)
{ {
obj = gtk_widget_get_accessible (GTK_WIDGET (button_image)); obj = gtk_widget_get_accessible (GTK_WIDGET (button_image));
return atk_image_set_image_description (ATK_IMAGE (obj), description); return atk_image_set_image_description (ATK_IMAGE (obj), description);