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

gtkentry: remove unnneded check in map/unmap functions

Browse Source
This commit is contained in:
Javier Jardón 2010-09-15 03:28:24 +02:00
parent e3a8e29a6c
commit 8345760fdb
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkentry.c
View File

@ -2694,21 +2694,18 @@ gtk_entry_map (GtkWidget *widget)
EntryIconInfo *icon_info = NULL; EntryIconInfo *icon_info = NULL;
gint i; gint i;
if (gtk_widget_get_realized (widget) && !gtk_widget_get_mapped (widget)) GTK_WIDGET_CLASS (gtk_entry_parent_class)->map (widget);
for (i = 0; i < MAX_ICONS; i++)
{ {
GTK_WIDGET_CLASS (gtk_entry_parent_class)->map (widget); if ((icon_info = priv->icons[i]) != NULL)
for (i = 0; i < MAX_ICONS; i++)
{ {
if ((icon_info = priv->icons[i]) != NULL) if (icon_info->pixbuf != NULL && icon_info->window != NULL)
{ gdk_window_show (icon_info->window);
if (icon_info->pixbuf != NULL && icon_info->window != NULL)
gdk_window_show (icon_info->window);
}
} }
update_cursors (widget);
} }
update_cursors (widget);
} }
static void static void
@ -2718,19 +2715,16 @@ gtk_entry_unmap (GtkWidget *widget)
EntryIconInfo *icon_info = NULL; EntryIconInfo *icon_info = NULL;
gint i; gint i;
if (gtk_widget_get_mapped (widget)) for (i = 0; i < MAX_ICONS; i++)
{ {
for (i = 0; i < MAX_ICONS; i++) if ((icon_info = priv->icons[i]) != NULL)
{ {
if ((icon_info = priv->icons[i]) != NULL) if (icon_info->pixbuf != NULL && icon_info->window != NULL)
{ gdk_window_hide (icon_info->window);
if (icon_info->pixbuf != NULL && icon_info->window != NULL)
gdk_window_hide (icon_info->window);
}
} }
GTK_WIDGET_CLASS (gtk_entry_parent_class)->unmap (widget);
} }
GTK_WIDGET_CLASS (gtk_entry_parent_class)->unmap (widget);
} }
static void static void