diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-04-29 20:09:56 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-04-29 20:09:56 +0000 |
| commit | d9322adafd75a0989b60738a8a3cef8b6571ac7e (patch) | |
| tree | 3539d183c74784a8de671d1e8a0bbdc963be982d | |
| parent | 6f2f51efc09dfce76b1aaae47c2b3618f1d62c12 (diff) | |
| download | gtk+-d9322adafd75a0989b60738a8a3cef8b6571ac7e.tar.gz | |
Get rid of this function, instead show the bin_window when it is created.
2005-04-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
function, instead show the bin_window when it is created.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtkiconview.c | 17 |
4 files changed, 11 insertions, 15 deletions
@@ -1,5 +1,8 @@ 2005-04-29 Matthias Clasen <mclasen@redhat.com> + * 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 1b026ec63b..21856b5bdf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-04-29 Matthias Clasen <mclasen@redhat.com> + * 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 1b026ec63b..21856b5bdf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-04-29 Matthias Clasen <mclasen@redhat.com> + * 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 6b38de53e0..b5e89dc55c 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -175,7 +175,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, @@ -303,7 +302,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; @@ -906,6 +904,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 @@ -925,19 +925,6 @@ gtk_icon_view_unrealize (GtkWidget *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) { |