diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-07-12 21:46:32 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-07-12 21:46:32 +0000 |
| commit | aefa836108a38841d424ff0d88bab927ceaa5202 (patch) | |
| tree | d739912a5db6a1fa83aaac8258caaf17248d41f2 /gtk | |
| parent | a70fca529beca4724d235653399cee611db8e870 (diff) | |
| download | gdk-pixbuf-aefa836108a38841d424ff0d88bab927ceaa5202.tar.gz | |
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.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkbbox.h | 4 | ||||
| -rw-r--r-- | gtk/gtkmenubar.c | 2 |
2 files changed, 3 insertions, 3 deletions
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); |