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.
This commit is contained in:
Owen Taylor 2001-07-12 21:46:32 +00:00 committed by Owen Taylor
parent a70fca529b
commit aefa836108
9 changed files with 73 additions and 10 deletions

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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,

View File

@ -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);