com gtk/php-gtk: Taking back the performance enhancements of GtkDialog constructor and GtkDialog::add_buttons, because tha t doesn't work on Steph's windows box: ext/ gtk+/gtk.overrides
[email protected] (David Soria Parra) Sun, 15 Jan 2006 11:02:54 +0000
| Newsgroups | php.gtk.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: ef31dede9c833f2fe56bdd43a558e860801fdaa4 Author: Christian Weiske <[email protected]> Sun, 15 Jan 2006 11:02:54 +0000 Parents: 5f081fd95ee3fbbb3f20b6d89be655886f00a360 Branches: master Link: http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=ef31dede9c833f2fe56bdd43a558e860801fdaa4 Log: Taking back the performance enhancements of GtkDialog constructor and GtkDialog::add_buttons, because that doesn't work on Steph's windows box Changed paths: M ext/gtk+/gtk.overrides Diff: ef31dede9c833f2fe56bdd43a558e860801fdaa4 diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides index 2c72d11..fd159c6 100644 --- a/ext/gtk+/gtk.overrides +++ b/ext/gtk+/gtk.overrides @@ -1091,8 +1091,6 @@ PHP_METHOD PHPG_THROW_CONSTRUCT_EXCEPTION(GtkDialog); } - GtkDialog *dialog = GTK_DIALOG(wrapped_obj); - zend_hash_internal_pointer_reset(Z_ARRVAL_P(buttons)); while (zend_hash_get_current_data(Z_ARRVAL_P(buttons), (void **)&text) == SUCCESS) { zend_hash_move_forward(Z_ARRVAL_P(buttons)); @@ -1106,7 +1104,7 @@ PHP_METHOD PHPG_THROW_CONSTRUCT_EXCEPTION(GtkDialog); } - gtk_dialog_add_button(dialog, Z_STRVAL_PP(text), Z_LVAL_PP(response)); + gtk_dialog_add_button(GTK_DIALOG(wrapped_obj), Z_STRVAL_PP(text), Z_LVAL_PP(response)); } } @@ -1140,8 +1138,6 @@ PHP_METHOD return; } - GtkDialog *dialog = GTK_DIALOG(PHPG_GOBJECT(this_ptr)); - zend_hash_internal_pointer_reset(Z_ARRVAL_P(buttons)); while (zend_hash_get_current_data(Z_ARRVAL_P(buttons), (void **)&text) == SUCCESS) { zend_hash_move_forward(Z_ARRVAL_P(buttons)); @@ -1154,7 +1150,7 @@ PHP_METHOD return; } - gtk_dialog_add_button(dialog, Z_STRVAL_PP(text), Z_LVAL_PP(response)); + gtk_dialog_add_button(GTK_DIALOG(PHPG_GOBJECT(this_ptr)), Z_STRVAL_PP(text), Z_LVAL_PP(response)); } }