Commit aefa8361 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent a70fca52
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> Thu Jul 12 16:51:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Replace a couple of inappropriate calls to * 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> ...@@ -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> Thu Jul 12 14:06:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
missing case. missing cast.
* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
NULL/FALSE return value confusion. NULL/FALSE return value confusion.
......
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> Thu Jul 12 16:51:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Replace a couple of inappropriate calls to * 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> ...@@ -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> Thu Jul 12 14:06:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
missing case. missing cast.
* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
NULL/FALSE return value confusion. NULL/FALSE return value confusion.
......
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> Thu Jul 12 16:51:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Replace a couple of inappropriate calls to * 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> ...@@ -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> Thu Jul 12 14:06:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
missing case. missing cast.
* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
NULL/FALSE return value confusion. NULL/FALSE return value confusion.
......
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> Thu Jul 12 16:51:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Replace a couple of inappropriate calls to * 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> ...@@ -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> Thu Jul 12 14:06:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
missing case. missing cast.
* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
NULL/FALSE return value confusion. NULL/FALSE return value confusion.
......
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> Thu Jul 12 16:51:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Replace a couple of inappropriate calls to * 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> ...@@ -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> Thu Jul 12 14:06:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
missing case. missing cast.
* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
NULL/FALSE return value confusion. NULL/FALSE return value confusion.
......
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> Thu Jul 12 16:51:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Replace a couple of inappropriate calls to * 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> ...@@ -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> Thu Jul 12 14:06:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
missing case. missing cast.
* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
NULL/FALSE return value confusion. NULL/FALSE return value confusion.
......
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> Thu Jul 12 16:51:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Replace a couple of inappropriate calls to * 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> ...@@ -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> Thu Jul 12 14:06:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
missing case. missing cast.
* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
NULL/FALSE return value confusion. NULL/FALSE return value confusion.
......
...@@ -74,8 +74,8 @@ void gtk_button_box_set_child_secondary (GtkButtonBox *widget, ...@@ -74,8 +74,8 @@ void gtk_button_box_set_child_secondary (GtkButtonBox *widget,
gboolean is_secondary); gboolean is_secondary);
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
#define gtk_button_box_set_spacing gtk_box_set_spacing #define gtk_button_box_set_spacing(b,s) gtk_box_set_spacing (GTK_BOX (b), s)
#define gtk_button_box_get_spacing gtk_box_get_spacing #define gtk_button_box_get_spacing(b) gtk_box_get_spacing (GTK_BOX (b))
void gtk_button_box_set_child_size (GtkButtonBox *widget, void gtk_button_box_set_child_size (GtkButtonBox *widget,
gint min_width, gint min_width,
......
...@@ -484,7 +484,7 @@ gtk_menu_bar_hierarchy_changed (GtkWidget *widget, ...@@ -484,7 +484,7 @@ gtk_menu_bar_hierarchy_changed (GtkWidget *widget,
toplevel = gtk_widget_get_toplevel (widget); toplevel = gtk_widget_get_toplevel (widget);
if (old_toplevel) 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)) if (GTK_WIDGET_TOPLEVEL (toplevel))
add_to_window (GTK_WINDOW (toplevel), menubar); add_to_window (GTK_WINDOW (toplevel), menubar);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment