Re: [php-gtk-cvs] cvs: php-gtk /ext/gtk+ gtktreeview.overrides

I will take a look at that patch next. Probably tomorrow. -Andrei On Nov 5, 2005, at 7:10 AM, Steph Fox wrote:

Andrei, I still think the gtktreepath functions are extremely useful in iteration - especially to_string(), but also the ways gtktreepath offers of manoeveuring between next/prev/up/down. Can I please commit that 'boxed treepath' patch? - Steph ----- Original Message ----- From: "Andrei Zmievski" <andrei@php.net> To: <php-gtk-cvs@lists.php.net> Sent: Saturday, November 05, 2005 4:37 AM Subject: [php-gtk-cvs] cvs: php-gtk /ext/gtk+ gtktreeview.overrides

andrei Fri Nov 4 23:37:45 2005 EDT Modified files:

    /php-gtk/ext/gtk+ gtktreeview.overrides

Log: Make GtkTreeModel::iter_next() return the next iterator _without_ changing the input one.

http://cvs.php.net/diff.php/php-gtk/ext/gtk+/gtktreeview.overrides?r1=1.22&r2=1.23&ty=u

Index: php-gtk/ext/gtk+/gtktreeview.overrides diff -u php-gtk/ext/gtk+/gtktreeview.overrides:1.22

php-gtk/ext/gtk+/gtktreeview.overrides:1.23

--- php-gtk/ext/gtk+/gtktreeview.overrides:1.22 Wed Nov 2 15:31:32 2005 +++ php-gtk/ext/gtk+/gtktreeview.overrides Fri Nov 4 23:37:43 2005 @@ -584,7 +584,7 @@ override gtk_tree_model_iter_next PHP_METHOD {

-    GtkTreeIter *iter;
+    GtkTreeIter iter;
     zval *php_iter;

     NOT_STATIC_METHOD();

@@ -592,13 +592,13 @@

     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "O", &php_iter,

gtktreeiter_ce))

         return;

-    iter = (GtkTreeIter *) PHPG_GBOXED(php_iter);
+    iter = *(GtkTreeIter *) PHPG_GBOXED(php_iter);

-    if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(PHPG_GOBJECT(this_ptr)),

iter)) {

-        RETURN_FALSE;
+    if (gtk_tree_model_iter_next(GTK_TREE_MODEL(PHPG_GOBJECT(this_ptr)),

&iter)) {

+        phpg_gboxed_new(&return_value, GTK_TYPE_TREE_ITER, &iter, TRUE,

TRUE TSRMLS_CC);

+    } else {
+        RETURN_NULL();
     }

-

-    phpg_gboxed_new(&return_value, GTK_TYPE_TREE_ITER, &iter, TRUE, TRUE

TSRMLS_CC);

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