com php/gtk-src: Fix gtktoolpalette def to avoid E_STRICT naming collision make sure to realize window before grab to avoid gdk assertion: ext/gtk+/gtk-2.20.defs tests/GtkWidget/has

Elizabeth Marie Smith

2012-07-18 12:26:17 UTC

Commit: 10001bfcabe54c4e082737293524dcfdfa9ecc5e
Author: Elizabeth M Smith <***@gmail.com> Mon, 16 Jul 2012 10:45:08 -0400
Parents: c71a8585bd0980f797e2169947e3904c3a1aa19a
Branches: master

Link: http://git.php.net/?p=php/gtk-src.git;a=commitdiff;h=10001bfcabe54c4e082737293524dcfdfa9ecc5e

Log:
Fix gtktoolpalette def to avoid E_STRICT naming collision
make sure to realize window before grab to avoid gdk assertion

Changed paths:
M ext/gtk+/gtk-2.20.defs
M tests/GtkWidget/has_grab.phpt

Diff:
diff --git a/ext/gtk+/gtk-2.20.defs b/ext/gtk+/gtk-2.20.defs
index 73b6a11..bc27ef7 100644
--- a/ext/gtk+/gtk-2.20.defs
+++ b/ext/gtk+/gtk-2.20.defs
@@ -88,7 +88,7 @@
(return-type "none")
)

-(define-method set_style
+(define-method set_toolbar_style
(of-object "GtkToolPalette")
(c-name "gtk_tool_palette_set_style")
(return-type "none")
@@ -97,7 +97,7 @@
)
)

-(define-method unset_style
+(define-method unset_toolbar_style
(of-object "GtkToolPalette")
(c-name "gtk_tool_palette_unset_style")
(return-type "none")
diff --git a/tests/GtkWidget/has_grab.phpt b/tests/GtkWidget/has_grab.phpt
index fcd0697..575816f 100644
--- a/tests/GtkWidget/has_grab.phpt
+++ b/tests/GtkWidget/has_grab.phpt
@@ -8,6 +8,7 @@ if(!method_exists('GtkWidget', 'has_grab')) die('skip - GtkWidget->has_grab not
--FILE--
<?php
$window = new GtkWindow();
+$window->realize();
var_dump($window->has_grab());

$window->grab_add();

--
PHP-GTK CVS Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php