diff --git a/ChangeLog b/ChangeLog
index a090de8750..de209179a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.
+
 2005-02-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* docs/iconcache.txt: Add some information about the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a090de8750..de209179a2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.
+
 2005-02-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* docs/iconcache.txt: Add some information about the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a090de8750..de209179a2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
+
+	* gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.
+
 2005-02-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* docs/iconcache.txt: Add some information about the
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 4b79d511ae..fad0697070 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1140,7 +1140,7 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
 	  
           combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
 
-	  toplevel = gtk_widget_get_toplevel (combo_box);
+	  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
 	  if (GTK_IS_WINDOW (toplevel))
 	    gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), 
 					 GTK_WINDOW (combo_box->priv->popup_window));
@@ -1601,7 +1601,7 @@ gtk_combo_box_popup (GtkComboBox *combo_box)
       return;
     }
 
-  toplevel = gtk_widget_get_toplevel (combo_box);
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
   if (GTK_IS_WINDOW (toplevel))
     gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), 
 				 GTK_WINDOW (combo_box->priv->popup_window));