From 88c656eba6866d9adfa0deeab8075aebe387ceb6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Apr 2005 20:09:12 +0000 Subject: [PATCH] Get rid of this function, instead show the bin_window when it is created. 2005-04-29 Matthias Clasen * gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this function, instead show the bin_window when it is created. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkiconview.c | 17 ++--------------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index d686b664a1..a25bf32e17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-04-29 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this + function, instead show the bin_window when it is created. + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't grab focus to unrealized widgets. (#302240, Philip Langdale) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d686b664a1..a25bf32e17 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-04-29 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this + function, instead show the bin_window when it is created. + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't grab focus to unrealized widgets. (#302240, Philip Langdale) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d686b664a1..a25bf32e17 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-04-29 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this + function, instead show the bin_window when it is created. + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't grab focus to unrealized widgets. (#302240, Philip Langdale) diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 03a910b74d..f9b5ace313 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -174,7 +174,6 @@ static void gtk_icon_view_destroy (GtkObject *object); /* GtkWidget signals */ static void gtk_icon_view_realize (GtkWidget *widget); static void gtk_icon_view_unrealize (GtkWidget *widget); -static void gtk_icon_view_map (GtkWidget *widget); static void gtk_icon_view_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_icon_view_size_allocate (GtkWidget *widget, @@ -300,7 +299,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) widget_class->realize = gtk_icon_view_realize; widget_class->unrealize = gtk_icon_view_unrealize; - widget_class->map = gtk_icon_view_map; widget_class->size_request = gtk_icon_view_size_request; widget_class->size_allocate = gtk_icon_view_size_allocate; widget_class->expose_event = gtk_icon_view_expose; @@ -903,6 +901,8 @@ gtk_icon_view_realize (GtkWidget *widget) widget->style = gtk_style_attach (widget->style, widget->window); gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]); gdk_window_set_background (widget->window, &widget->style->base[widget->state]); + + gdk_window_show (icon_view->priv->bin_window); } static void @@ -921,19 +921,6 @@ gtk_icon_view_unrealize (GtkWidget *widget) (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } -static void -gtk_icon_view_map (GtkWidget *widget) -{ - GtkIconView *icon_view; - - icon_view = GTK_ICON_VIEW (widget); - - GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - - gdk_window_show (icon_view->priv->bin_window); - gdk_window_show (widget->window); -} - static void gtk_icon_view_size_request (GtkWidget *widget, GtkRequisition *requisition)