diff options
| author | Hans Breuer <hans@breuer.org> | 2008-06-21 09:49:00 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2008-06-21 09:49:00 +0000 |
| commit | d3ce448c208da3bdc27367ee8e3459e2e211ba78 (patch) | |
| tree | 90754b3e79876e0ac04d2e7518ef85f60cfb90af /gtk/gtkmenu.c | |
| parent | 743eebc1a5bfda14eb152c07c72dc63ad87394e7 (diff) | |
| download | gtk+-d3ce448c208da3bdc27367ee8e3459e2e211ba78.tar.gz | |
fix 'function' : incompatible types - from 'struct _cairo *' to 'struct
2008-06-21 Hans Breuer <hans@breuer.org>
* gtk/gtkprintoperation-win32.c(1713) : fix 'function' : incompatible
types - from 'struct _cairo *' to 'struct _cairo_surface *' by
passing the surface to cairo_surface_show_page(), not the context
* gtk/gtkprintoperation-win32.c(866) : get rid of warning C4018:
'<' : signed/unsigned mismatch by using guint for the loop
* gtk/gtkmenu.c(gtk_menu_get_property) : property 'menu::active' is
an uint, gtk_menu_get_active() returns the widget pointer. Convert
the latter to the former by calculating the index in menu::children
Also fix some occurences of g_return_if_fail() where
g_return_val_if_fail() was meant
svn path=/trunk/; revision=20662
Diffstat (limited to 'gtk/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 63bc5e3563..715eb7a86a 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -822,7 +822,7 @@ gtk_menu_get_property (GObject *object, switch (prop_id) { case PROP_ACTIVE: - g_value_set_boolean (value, gtk_menu_get_active (menu)); + g_value_set_uint (value, g_list_index (GTK_MENU_SHELL (menu)->children, gtk_menu_get_active (menu))); break; case PROP_ACCEL_GROUP: g_value_set_object (value, gtk_menu_get_accel_group (menu)); @@ -1776,7 +1776,7 @@ gtk_menu_set_accel_path (GtkMenu *menu, const gchar* gtk_menu_get_accel_path (GtkMenu *menu) { - g_return_if_fail (GTK_IS_MENU (menu)); + g_return_val_if_fail (GTK_IS_MENU (menu), NULL); return menu->accel_path; } @@ -5060,7 +5060,7 @@ gint gtk_menu_get_monitor (GtkMenu *menu) { GtkMenuPrivate *priv; - g_return_if_fail (GTK_IS_MENU (menu)); + g_return_val_if_fail (GTK_IS_MENU (menu), -1); priv = gtk_menu_get_private (menu); |