com gtk/php-gtk: Fixing get_active_iter() to not require a parameter but return one: ext/gtk+/gtk .overrides test/bug_gtkcombobox_get_active_iter.p hp

Commit:    d4eccfcc80573230836b3fd3a9fc6ef43629f185
Author:    Christian Weiske <[email protected]>         Mon, 6 Mar 2006 20:52:17 +0000
Parents:   e79537a17b6237df978b78b5f8b19ce1f37cede3
Branches:  master

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

Log:
Fixing get_active_iter() to not require a parameter but return one

Changed paths:
  M  ext/gtk+/gtk.overrides
  A  test/bug_gtkcombobox_get_active_iter.php


Diff:
d4eccfcc80573230836b3fd3a9fc6ef43629f185
diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides
index 6876c90..e67d326 100644
--- a/ext/gtk+/gtk.overrides
+++ b/ext/gtk+/gtk.overrides
@@ -1095,6 +1095,32 @@ PHP_METHOD
 }
 %% }}}
 
+<<<<<<< gtk.overrides
+
+%% {{{ GtkComboBox
+
+%%
+override gtk_combo_box_get_active_iter
+PHP_METHOD
+{
+    GtkTreeIter iter;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(PHPG_GOBJECT(this_ptr)), &iter)) {
+        phpg_gboxed_new(&return_value, GTK_TYPE_TREE_ITER, &iter, TRUE, TRUE TSRMLS_CC);
+    }
+}
+
+%% }}}
+
+%% include gtkcontainer.overrides
+
+=======
+>>>>>>> 1.153
 %% {{{ GtkDialog
 
 %%
diff --git a/test/bug_gtkcombobox_get_active_iter.php b/test/bug_gtkcombobox_get_active_iter.php
new file mode 100644
index 0000000..3cc3b97
--- /dev/null
+++ b/test/bug_gtkcombobox_get_active_iter.php
@@ -0,0 +1,14 @@
+<?php
+$cmb = new GtkComboBox();
+$mod = new GtkListStore(Gtk::TYPE_STRING);
+$cmb->set_model($mod);
+
+$mod->append(array("one"));
+$mod->append(array("two"));
+$mod->append(array("three"));
+
+$cmb->set_active(1);
+
+//that should return an iter, not require one
+var_dump($cmb->get_active_iter());
+?>
\ No newline at end of file