summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-04-08 22:03:53 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-04-08 22:03:53 +0000
commit083e03fee509368c7468bd0926268a9a523160a2 (patch)
treebcf1df32cce917e8c06080f242e4dde4514cbb8d
parent361429159c62f9a38a065f9c5c41b4e86f782166 (diff)
downloadgdk-pixbuf-083e03fee509368c7468bd0926268a9a523160a2.tar.gz
Make this work when called from gtk_combo_box_destroy(). (#172999,
2005-04-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this work when called from gtk_combo_box_destroy(). (#172999, Christian Persch)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkcombobox.c6
4 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 320bb8bb4..6c7114e7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-04-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
+ work when called from gtk_combo_box_destroy(). (#172999,
+ Christian Persch)
+
+2005-04-08 Matthias Clasen <mclasen@redhat.com>
+
Fix double-click to autosize treeview columns. This was
probably broken since 2.2 ! (#169675)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 320bb8bb4..6c7114e7d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
2005-04-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
+ work when called from gtk_combo_box_destroy(). (#172999,
+ Christian Persch)
+
+2005-04-08 Matthias Clasen <mclasen@redhat.com>
+
Fix double-click to autosize treeview columns. This was
probably broken since 2.2 ! (#169675)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 320bb8bb4..6c7114e7d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
2005-04-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
+ work when called from gtk_combo_box_destroy(). (#172999,
+ Christian Persch)
+
+2005-04-08 Matthias Clasen <mclasen@redhat.com>
+
Fix double-click to autosize treeview columns. This was
probably broken since 2.2 ! (#169675)
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index f6254793c..93a5e4e75 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1669,15 +1669,15 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
{
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box)))
- return;
-
if (GTK_IS_MENU (combo_box->priv->popup_widget))
{
gtk_menu_popdown (GTK_MENU (combo_box->priv->popup_widget));
return;
}
+ if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box)))
+ return;
+
gtk_combo_box_list_remove_grabs (combo_box);
gtk_widget_hide_all (combo_box->priv->popup_window);