Patch from Mathias Hasselmann to fix warnings in compat macros. (#56773)

Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias
	Hasselmann to fix warnings in compat macros.
	(#56773)

	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix
	stupid wrong cast added in last patch.

9 files changed, 73 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 42496c31d..6a7fc25b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias 
+	Hasselmann to fix warnings in compat macros. 
+	(#56773)
+
+	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix 
+	stupid wrong cast added in last patch.
+
 Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
@@ -6,7 +15,7 @@ Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
-	missing case.
+	missing cast.
 
 	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
 	NULL/FALSE return value confusion.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 42496c31d..6a7fc25b6 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias 
+	Hasselmann to fix warnings in compat macros. 
+	(#56773)
+
+	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix 
+	stupid wrong cast added in last patch.
+
 Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
@@ -6,7 +15,7 @@ Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
-	missing case.
+	missing cast.
 
 	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
 	NULL/FALSE return value confusion.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 42496c31d..6a7fc25b6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias 
+	Hasselmann to fix warnings in compat macros. 
+	(#56773)
+
+	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix 
+	stupid wrong cast added in last patch.
+
 Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
@@ -6,7 +15,7 @@ Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
-	missing case.
+	missing cast.
 
 	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
 	NULL/FALSE return value confusion.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 42496c31d..6a7fc25b6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias 
+	Hasselmann to fix warnings in compat macros. 
+	(#56773)
+
+	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix 
+	stupid wrong cast added in last patch.
+
 Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
@@ -6,7 +15,7 @@ Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
-	missing case.
+	missing cast.
 
 	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
 	NULL/FALSE return value confusion.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 42496c31d..6a7fc25b6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias 
+	Hasselmann to fix warnings in compat macros. 
+	(#56773)
+
+	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix 
+	stupid wrong cast added in last patch.
+
 Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
@@ -6,7 +15,7 @@ Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
-	missing case.
+	missing cast.
 
 	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
 	NULL/FALSE return value confusion.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 42496c31d..6a7fc25b6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias 
+	Hasselmann to fix warnings in compat macros. 
+	(#56773)
+
+	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix 
+	stupid wrong cast added in last patch.
+
 Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
@@ -6,7 +15,7 @@ Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
-	missing case.
+	missing cast.
 
 	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
 	NULL/FALSE return value confusion.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 42496c31d..6a7fc25b6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Jul 12 17:33:00 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkbbox.h gtk/gtkcompat.h: Patch from Mathias 
+	Hasselmann to fix warnings in compat macros. 
+	(#56773)
+
+	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Fix 
+	stupid wrong cast added in last patch.
+
 Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
@@ -6,7 +15,7 @@ Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
-	missing case.
+	missing cast.
 
 	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
 	NULL/FALSE return value confusion.
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 8a7853f78..0b6d11f9d 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -74,8 +74,8 @@ void              gtk_button_box_set_child_secondary (GtkButtonBox      *widget,
 						      gboolean           is_secondary);
 
 #ifndef GTK_DISABLE_DEPRECATED
-#define gtk_button_box_set_spacing gtk_box_set_spacing
-#define gtk_button_box_get_spacing gtk_box_get_spacing
+#define gtk_button_box_set_spacing(b,s) gtk_box_set_spacing (GTK_BOX (b), s)
+#define gtk_button_box_get_spacing(b)   gtk_box_get_spacing (GTK_BOX (b))
 
 void gtk_button_box_set_child_size     (GtkButtonBox *widget,
 					gint          min_width,
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 15100d7de..1268fb35a 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -484,7 +484,7 @@ gtk_menu_bar_hierarchy_changed (GtkWidget *widget,
   toplevel = gtk_widget_get_toplevel (widget);
 
   if (old_toplevel)
-    remove_from_window (old_toplevel, GTK_WINDOW (menubar));
+    remove_from_window (old_toplevel, GTK_MENU_BAR (menubar));
   
   if (GTK_WIDGET_TOPLEVEL (toplevel))
     add_to_window (GTK_WINDOW (toplevel), menubar);