cvs: php-gtk /ext/gtk+ gtk.overrides /ext/libglade libglade.overrides
[email protected] ("Andrei Zmievski") Fri, 10 Aug 2001 16:15:56 -0000
| Newsgroups | php.gtk |
|---|---|
| Message-ID | <cvsandrei997460156@cvsserver> |
andrei Fri Aug 10 12:15:56 2001 EDT
Modified files:
/php-gtk/ext/gtk+ gtk.overrides
/php-gtk/ext/libglade libglade.overrides
Log:
- Fix crashes in GtkRadioButton() and GtkRadioMenuItem() constructors.
- Make libglade extension compile again until I commit my stuff from laptop
at home.
Index: php-gtk/ext/gtk+/gtk.overrides
diff -u php-gtk/ext/gtk+/gtk.overrides:1.8 php-gtk/ext/gtk+/gtk.overrides:1.9
--- php-gtk/ext/gtk+/gtk.overrides:1.8 Tue Jul 31 01:27:00 2001
+++ php-gtk/ext/gtk+/gtk.overrides Fri Aug 10 12:15:56 2001
@@ -1660,7 +1660,7 @@
if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|Ns", &php_group, gtk_radiomenuitem_ce, &text))
return;
- if (Z_TYPE_P(php_group) != IS_NULL)
+ if (php_group && Z_TYPE_P(php_group) != IS_NULL)
group = GTK_RADIO_MENU_ITEM(PHP_GTK_GET(php_group));
if (!text) {
@@ -1700,7 +1700,7 @@
if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|Ns", &php_group, gtk_radiobutton_ce, &text))
return;
- if (Z_TYPE_P(php_group) != IS_NULL)
+ if (php_group && Z_TYPE_P(php_group) != IS_NULL)
group = GTK_RADIO_BUTTON(PHP_GTK_GET(php_group));
if (!text) {
Index: php-gtk/ext/libglade/libglade.overrides
diff -u php-gtk/ext/libglade/libglade.overrides:1.4 php-gtk/ext/libglade/libglade.overrides:1.5
--- php-gtk/ext/libglade/libglade.overrides:1.4 Fri Aug 10 01:28:05 2001
+++ php-gtk/ext/libglade/libglade.overrides Fri Aug 10 12:15:56 2001
@@ -75,13 +75,13 @@
RETURN_NULL();
}
-PHP_FUNCTION(glade_xml_signal_connect)
+PHP_FUNCTION(wrap_glade_xml_signal_connect)
{
glade_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
%%
override glade_xml_signal_connect_object signal_connect_object GladeXML
-PHP_FUNCTION(glade_xml_signal_connect_object)
+PHP_FUNCTION(wrap_glade_xml_signal_connect_object)
{
glade_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -167,13 +167,13 @@
(GladeXMLConnectFunc)glade_connect_auto, ac_data);
}
-PHP_FUNCTION(glade_xml_signal_autoconnect)
+PHP_FUNCTION(wrap_glade_xml_signal_autoconnect)
{
glade_signal_autoconnect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
%%
override glade_xml_signal_autoconnect_object signal_autoconnect_object GladeXML
-PHP_FUNCTION(glade_xml_signal_autoconnect_object)
+PHP_FUNCTION(wrap_glade_xml_signal_autoconnect_object)
{
glade_signal_autoconnect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}