perl-Gtk2 r2085 - in branches/stable-1-20: . t xs

[tsch svn gnome org]

Author: tsch
Date: Sat Nov  1 16:28:51 2008
New Revision: 2085
URL: http://svn.gnome.org/viewvc/perl-Gtk2?rev=2085&view=rev

Log:
Merge r2084 from trunk.


Modified:
   branches/stable-1-20/ChangeLog
   branches/stable-1-20/t/GtkCellRenderer.t
   branches/stable-1-20/xs/GtkCellRenderer.xs

Modified: branches/stable-1-20/t/GtkCellRenderer.t
==============================================================================
--- branches/stable-1-20/t/GtkCellRenderer.t	(original)
+++ branches/stable-1-20/t/GtkCellRenderer.t	Sat Nov  1 16:28:51 2008
@@ -2,7 +2,7 @@
 
 # $Id$
 
-use Gtk2::TestHelper tests => 9;
+use Gtk2::TestHelper tests => 13;
 use strict;
 
 package Mup::CellRendererPopup;
@@ -119,6 +119,10 @@
 my $rect = Gtk2::Gdk::Rectangle->new (5, 5, 10, 10);
 my @size = $renderer->get_size ($treeview, $rect);
 is (@size, 4);
+like($size[0], qr/^\d+$/);
+like($size[1], qr/^\d+$/);
+like($size[2], qr/^\d+$/);
+like($size[3], qr/^\d+$/);
 
 my $event = Gtk2::Gdk::Event->new ("button-press");
 

Modified: branches/stable-1-20/xs/GtkCellRenderer.xs
==============================================================================
--- branches/stable-1-20/xs/GtkCellRenderer.xs	(original)
+++ branches/stable-1-20/xs/GtkCellRenderer.xs	Sat Nov  1 16:28:51 2008
@@ -508,8 +508,10 @@
 	gint width;
 	gint height;
     PPCODE:
+	PUTBACK;
 	gtk_cell_renderer_get_size(cell, widget, cell_area,
 		&x_offset, &y_offset, &width, &height);
+	SPAGAIN;
 	EXTEND(SP,4);
 	PUSHs(sv_2mortal(newSViv(x_offset)));
 	PUSHs(sv_2mortal(newSViv(y_offset)));