cast to GTK_WIDGET() for the gtk_widget_hide() call.

Thu Nov 20 15:41:56 2003  Manish Singh  <yosh@gimp.org>

        * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): cast to GTK_WIDGET()
        for the gtk_widget_hide() call.

diff --git a/ChangeLog b/ChangeLog
index f70e827dce0e1245926fd54d92be8ad90ae0ff96..f1541312faaa995cb6987fb03df35b30e14395ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 20 15:41:56 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): cast to GTK_WIDGET()
+       for the gtk_widget_hide() call.
+
 Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
@@ -20,6 +25,7 @@ Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
        * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
        throw up an error dialog if the desktop doesn't exist.
        (error_message): Handle the case where there is no real toplevel
+
        yet.
        (list_model_filter_func): Always let folders pass through (patch
        by Dave Malcolm).

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f70e827dce0e1245926fd54d92be8ad90ae0ff96..f1541312faaa995cb6987fb03df35b30e14395ce 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Nov 20 15:41:56 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): cast to GTK_WIDGET()
+       for the gtk_widget_hide() call.
+
 Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
@@ -20,6 +25,7 @@ Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
        * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
        throw up an error dialog if the desktop doesn't exist.
        (error_message): Handle the case where there is no real toplevel
+
        yet.
        (list_model_filter_func): Always let folders pass through (patch
        by Dave Malcolm).

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f70e827dce0e1245926fd54d92be8ad90ae0ff96..f1541312faaa995cb6987fb03df35b30e14395ce 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Nov 20 15:41:56 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): cast to GTK_WIDGET()
+       for the gtk_widget_hide() call.
+
 Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
@@ -20,6 +25,7 @@ Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
        * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
        throw up an error dialog if the desktop doesn't exist.
        (error_message): Handle the case where there is no real toplevel
+
        yet.
        (list_model_filter_func): Always let folders pass through (patch
        by Dave Malcolm).

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f70e827dce0e1245926fd54d92be8ad90ae0ff96..f1541312faaa995cb6987fb03df35b30e14395ce 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Nov 20 15:41:56 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): cast to GTK_WIDGET()
+       for the gtk_widget_hide() call.
+
 Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
@@ -20,6 +25,7 @@ Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
        * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
        throw up an error dialog if the desktop doesn't exist.
        (error_message): Handle the case where there is no real toplevel
+
        yet.
        (list_model_filter_func): Always let folders pass through (patch
        by Dave Malcolm).

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f70e827dce0e1245926fd54d92be8ad90ae0ff96..f1541312faaa995cb6987fb03df35b30e14395ce 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Nov 20 15:41:56 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): cast to GTK_WIDGET()
+       for the gtk_widget_hide() call.
+
 Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
@@ -20,6 +25,7 @@ Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
        * gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
        throw up an error dialog if the desktop doesn't exist.
        (error_message): Handle the case where there is no real toplevel
+
        yet.
        (list_model_filter_func): Always let folders pass through (patch
        by Dave Malcolm).

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 4e303f56c580178a3625653ba6c82c001071c068..db002aa4cf5e6b553bb411075a6a0760f810b362 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1673,7 +1673,7 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
        }
       else
        {
-         gtk_widget_hide (menu);
+         gtk_widget_hide (GTK_WIDGET (menu));
          gtk_widget_hide (menu->tearoff_window);
          gtk_menu_reparent (menu, menu->toplevel, FALSE);
          gtk_widget_destroy (menu->tearoff_window);