[gtk+] gtkentry: remove unnneded check in map/unmap functions
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtkentry: remove unnneded check in map/unmap functions
- Date: Wed, 15 Sep 2010 02:00:46 +0000 (UTC)
commit 8345760fdb52c9ca4228b8faa27410fa78a122f9
Author: Javier Jardón <jjardon gnome org>
Date: Wed Sep 15 03:28:24 2010 +0200
gtkentry: remove unnneded check in map/unmap functions
gtk/gtkentry.c | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
---
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index f9b9a41..5aea137 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2694,21 +2694,18 @@ gtk_entry_map (GtkWidget *widget)
EntryIconInfo *icon_info = NULL;
gint i;
- if (gtk_widget_get_realized (widget) && !gtk_widget_get_mapped (widget))
- {
- GTK_WIDGET_CLASS (gtk_entry_parent_class)->map (widget);
+ GTK_WIDGET_CLASS (gtk_entry_parent_class)->map (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_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
@@ -2718,19 +2715,16 @@ gtk_entry_unmap (GtkWidget *widget)
EntryIconInfo *icon_info = NULL;
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]