com gtk/php-gtk: GtkCellRenderer::get_fixed_size() and GtkTreeModel::iter_next(): ext/gtk+/gtkt reeview.overrides

[email protected] (David Soria Parra) Wed, 02 Nov 2005 20:31:32 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    5ac995a141e78f8f3eff46475299ac98f8a04060
Author:    Steph Fox <[email protected]>         Wed, 2 Nov 2005 20:31:32 +0000
Parents:   87c4c4116075d6b7b7089fc8325201a4128d7d19
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=5ac995a141e78f8f3eff46475299ac98f8a04060

Log:
GtkCellRenderer::get_fixed_size() and GtkTreeModel::iter_next()

Changed paths:
  M  ext/gtk+/gtktreeview.overrides


Diff:
5ac995a141e78f8f3eff46475299ac98f8a04060
diff --git a/ext/gtk+/gtktreeview.overrides b/ext/gtk+/gtktreeview.overrides
index aa13107..8781581 100644
--- a/ext/gtk+/gtktreeview.overrides
+++ b/ext/gtk+/gtktreeview.overrides
@@ -13,6 +13,7 @@ ignore-glob
     gtk_tree_path_*
 %%
 ignore
+    gtk_cell_renderer_get_size
     gtk_list_store_newv
     gtk_list_store_set_valist
     gtk_tree_row_reference_new_proxy
@@ -86,6 +87,24 @@ PHP_METHOD
 }
 %% }}}
 
+%% {{{ GtkCellRenderer
+%%
+override gtk_cell_renderer_get_fixed_size
+PHP_METHOD
+{
+    int width, height = 0;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    gtk_cell_renderer_get_fixed_size(GTK_CELL_RENDERER(PHPG_GOBJECT(this_ptr)), &width, &height);
+    php_gtk_build_value(&return_value, "(ii)", width, height);
+}
+
+%% }}}
+
 %% {{{ GtkListStore
 %%
 add-arginfo GtkListStore __construct
@@ -492,6 +511,7 @@ PHP_METHOD
 
     phpg_gboxed_new(&return_value, GTK_TYPE_TREE_ITER, &iter, TRUE, TRUE TSRMLS_CC);
 }
+
 %%
 override gtk_tree_model_get_value
 PHP_METHOD
@@ -554,6 +574,34 @@ PHP_METHOD
 }
 
 %%
+add-arginfo GtkTreeModel iter_next
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_INFO(0, iter)
+ZEND_END_ARG_INFO();
+
+%%
+override gtk_tree_model_iter_next
+PHP_METHOD
+{
+    GtkTreeIter *iter;
+    zval *php_iter;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "O", &php_iter, gtktreeiter_ce))
+        return;
+
+    iter = (GtkTreeIter *) PHPG_GBOXED(php_iter);
+
+    if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(PHPG_GOBJECT(this_ptr)), iter)) {
+        RETURN_FALSE;
+    }
+
+    phpg_gboxed_new(&return_value, GTK_TYPE_TREE_ITER, &iter, TRUE, TRUE TSRMLS_CC);
+}
+
+%%
 override gtk_tree_model_foreach
 
 gboolean phpg_tree_model_foreach_marshal(GtkTreeModel *model,