AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't show nonexisting windows

Browse Source 
svn path=/trunk/; revision=22169
This commit is contained in:
Matthias Clasen 2009-01-22 00:34:30 +00:00
parent 52f0975370
commit 78b2971d6e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2009-01-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c: Don't show windows that may not exist
2009-01-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: Implement select-by-words for selectable labels.

6
gtk/gtkentry.c
View File

@ -2432,7 +2432,7 @@ update_cursors (GtkWidget *widget)
{
if ((icon_info = priv->icons[i]) != NULL)
{
if (icon_info->pixbuf != NULL)
if (icon_info->pixbuf != NULL && icon_info->window != NULL)
gdk_window_show_unraised (icon_info->window);
/* The icon windows are not children of the visible entry window,
@ -3772,7 +3772,7 @@ gtk_entry_motion_notify (GtkWidget *widget,
gtk_entry_set_positions (entry, pos, bound);
}
else
gtk_entry_set_positions (entry, tmp_pos, -1);
gtk_entry_set_positions (entry, tmp_pos, -1);
}
return TRUE;
@ -6305,7 +6305,7 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry,
break;
}
if (icon_info->pixbuf != NULL)
if (icon_info->pixbuf != NULL && icon_info->window != NULL)
gdk_window_show_unraised (icon_info->window);
}