Add appropriate type casts for the gtk_window_set_screen() call.

Sun Feb  8 01:28:02 2004  Manish Singh  <yosh@gimp.org>

        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate
        type casts for the gtk_window_set_screen() call.

diff --git a/ChangeLog b/ChangeLog
index b36aaafdfc5a21b1910595c7afe6e0858576546f..f28ad0437d55964c2d6e7f5e132200ac66fc8f87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  8 01:28:02 2004  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate
+       type casts for the gtk_window_set_screen() call.
+
 Sun Feb  8 01:44:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Make popups 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b36aaafdfc5a21b1910595c7afe6e0858576546f..f28ad0437d55964c2d6e7f5e132200ac66fc8f87 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Feb  8 01:28:02 2004  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate
+       type casts for the gtk_window_set_screen() call.
+
 Sun Feb  8 01:44:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Make popups 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b36aaafdfc5a21b1910595c7afe6e0858576546f..f28ad0437d55964c2d6e7f5e132200ac66fc8f87 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Feb  8 01:28:02 2004  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate
+       type casts for the gtk_window_set_screen() call.
+
 Sun Feb  8 01:44:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Make popups 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b36aaafdfc5a21b1910595c7afe6e0858576546f..f28ad0437d55964c2d6e7f5e132200ac66fc8f87 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Feb  8 01:28:02 2004  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate
+       type casts for the gtk_window_set_screen() call.
+
 Sun Feb  8 01:44:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Make popups 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b36aaafdfc5a21b1910595c7afe6e0858576546f..f28ad0437d55964c2d6e7f5e132200ac66fc8f87 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Feb  8 01:28:02 2004  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate
+       type casts for the gtk_window_set_screen() call.
+
 Sun Feb  8 01:44:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Make popups 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index fabb8b4aff98d0189e08247b1ba3f0974e438b5d..54a8450594f0145032dd58c8fabd9a3ef4615cc8 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -693,9 +693,9 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
       if (!combo_box->priv->popup_window)
         {
           combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-         gtk_window_set_screen (combo_box->priv->popup_window, 
-                                gtk_widget_get_screen (combo_box));
-         
+          gtk_window_set_screen (GTK_WINDOW (combo_box->priv->popup_window),
+                                 gtk_widget_get_screen (GTK_WIDGET (combo_box)));
+
           combo_box->priv->popup_frame = gtk_frame_new (NULL);
           gtk_frame_set_shadow_type (GTK_FRAME (combo_box->priv->popup_frame),
                                      GTK_SHADOW_NONE);