com php/gtk-src: Fix gtktoolpalette def to avoid E_STRICT n aming collision make sure to realize window befor e grab to avoid gdk assertion: ext/gtk+/gtk-2 .20.defs tests/GtkWidget/has_grab.phpt

[email protected] (Elizabeth Marie Smith) Mon, 16 Jul 2012 14:45:08 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    2e4c7ed3b7649453ae5e1cb8119bd2f55efe636b=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Mon, 16 Jul 2012 10:45:08 -0400=
=0AParents:   08001beae7d1c7dc3052dcc780557456114ab34a=0ABranches:  master=
=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=
=3D2e4c7ed3b7649453ae5e1cb8119bd2f55efe636b=0A=0ALog:=0AFix gtktoolpalette =
def to avoid E_STRICT naming collision=0Amake sure to realize window before=
 grab to avoid gdk assertion=0A=0AChanged paths:=0A  M  ext/gtk+/gtk-2.20.d=
efs=0A  M  tests/GtkWidget/has_grab.phpt=0A=0A=0ADiff:=0Adiff --git a/ext/g=
tk+/gtk-2.20.defs b/ext/gtk+/gtk-2.20.defs=0Aindex 73b6a11..bc27ef7 100644=
=0A--- a/ext/gtk+/gtk-2.20.defs=0A+++ b/ext/gtk+/gtk-2.20.defs=0A@@ -88,7 +=
88,7 @@=0A   (return-type "none")=0A )=0A =0A-(define-method set_style=0A+(=
define-method set_toolbar_style=0A   (of-object "GtkToolPalette")=0A   (c-n=
ame "gtk_tool_palette_set_style")=0A   (return-type "none")=0A@@ -97,7 +97,=
7 @@=0A   )=0A )=0A =0A-(define-method unset_style=0A+(define-method unset_=
toolbar_style=0A   (of-object "GtkToolPalette")=0A   (c-name "gtk_tool_pale=
tte_unset_style")=0A   (return-type "none")=0Adiff --git a/tests/GtkWidget/=
has_grab.phpt b/tests/GtkWidget/has_grab.phpt=0Aindex fcd0697..575816f 1006=
44=0A--- a/tests/GtkWidget/has_grab.phpt=0A+++ b/tests/GtkWidget/has_grab.p=
hpt=0A@@ -8,6 +8,7 @@ if(!method_exists('GtkWidget', 'has_grab')) die('skip=
 - GtkWidget->has_grab not=0A --FILE--
 <?php
 $window =3D new GtkWindow();
+$window->realize();
 var_dump($window->has_grab());
=20
 $window->grab_add();=0A