Commit d3ce448c authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

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
parent 743eebc1
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
2008-06-21 Björn Lindqvist <bjourne@gmail.com>
Bug 539363 – Segfault when creating GtkPlugs
......
......@@ -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);
......
......@@ -844,7 +844,7 @@ static void
dialog_to_print_settings (GtkPrintOperation *op,
LPPRINTDLGEXW printdlgex)
{
int i;
guint i;
GtkPrintSettings *settings;
settings = gtk_print_settings_new ();
......@@ -1710,7 +1710,7 @@ _gtk_print_operation_platform_backend_preview_end_page (GtkPrintOperation *op,
{
HDC dc;
cairo_surface_show_page (cr);
cairo_surface_show_page (surface);
/* TODO: Enhanced metafiles don't support multiple pages.
*/
......
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