diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-09-19 21:29:57 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-09-19 21:29:57 +0000 |
| commit | 1513d3aa4131666b6d679337e5c0b9ad5b9abfb1 (patch) | |
| tree | ac05be2fc95ce5afd5610f744d40393e716bcdbb /gtk | |
| parent | 5a2659c215984b721e24f043e1154720ad0c6790 (diff) | |
| download | gdk-pixbuf-1513d3aa4131666b6d679337e5c0b9ad5b9abfb1.tar.gz | |
Add missing cast.
Wed Sep 19 17:28:47 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
* gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
non-public _gtk_menu_item_set_placement.
* gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmenuitem.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmenuitem.h | 2 | ||||
| -rw-r--r-- | gtk/gtkmenushell.c | 2 | ||||
| -rw-r--r-- | gtk/gtktooltips.h | 2 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 627d38c61..edc7f4f3f 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -334,7 +334,7 @@ gtk_menu_item_remove_submenu (GtkMenuItem *menu_item) } void -gtk_menu_item_set_placement (GtkMenuItem *menu_item, +_gtk_menu_item_set_placement (GtkMenuItem *menu_item, GtkSubmenuPlacement placement) { g_return_if_fail (GTK_IS_MENU_ITEM (menu_item)); diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index 90005d81f..1f46eaa8f 100644 --- a/gtk/gtkmenuitem.h +++ b/gtk/gtkmenuitem.h @@ -94,7 +94,7 @@ void gtk_menu_item_set_submenu (GtkMenuItem *menu_item, GtkWidget *submenu); GtkWidget* gtk_menu_item_get_submenu (GtkMenuItem *menu_item); void gtk_menu_item_remove_submenu (GtkMenuItem *menu_item); -void gtk_menu_item_set_placement (GtkMenuItem *menu_item, +void _gtk_menu_item_set_placement (GtkMenuItem *menu_item, GtkSubmenuPlacement placement); void gtk_menu_item_select (GtkMenuItem *menu_item); void gtk_menu_item_deselect (GtkMenuItem *menu_item); diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 5fa8917b2..ffc1499b8 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -784,7 +784,7 @@ gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell, gtk_menu_shell_deselect (menu_shell); menu_shell->active_menu_item = menu_item; - gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item), + _gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item), GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement); gtk_menu_item_select (GTK_MENU_ITEM (menu_shell->active_menu_item)); diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h index b88ae57d5..825e9635a 100644 --- a/gtk/gtktooltips.h +++ b/gtk/gtktooltips.h @@ -82,8 +82,10 @@ GtkTooltips* gtk_tooltips_new (void); void gtk_tooltips_enable (GtkTooltips *tooltips); void gtk_tooltips_disable (GtkTooltips *tooltips); +#ifndef GTK_DISABLE_DEPRECATED void gtk_tooltips_set_delay (GtkTooltips *tooltips, guint delay); +#endif /* GTK_DISABLE_DEPRECATED */ void gtk_tooltips_set_tip (GtkTooltips *tooltips, GtkWidget *widget, const gchar *tip_text, diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index c039bb06a..6227967e7 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -1356,7 +1356,7 @@ gtk_widget_new (GtkType type, g_return_val_if_fail (gtk_type_is_a (type, GTK_TYPE_WIDGET), NULL); va_start (var_args, first_property_name); - widget = g_object_new_valist (type, first_property_name, var_args); + widget = (GtkWidget *)g_object_new_valist (type, first_property_name, var_args); va_end (var_args); return widget; |