[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-gtk-cvs
Subject:    [php-gtk-cvs] com gtk/php-gtk: Implemented =?UTF-8?Q?GtkCTree=3A=3Anode=5Fget=5Fpixmap?= =?UTF-8?Q?=
From:       David Soria Parra <dsp () php ! net>
Date:       2001-05-23 21:10:51
Message-ID: php-mail-221d3006c4275e139943e9d6a998d644698189700 () git ! php ! net
[Download RAW message or body]

Commit:    c826cba4b486ed27291800fa8130755a2fe24ae9
Author:    Andrei Zmievski <andrei@php.net>         Wed, 23 May 2001 21:10:51 +0000
Parents:   23867112fe006be2b7e9d153ad4dc363aef819c2
Branches:  GTK2 PHP_GTK_1 ZE2_PORT devel master

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

Log:
Implemented GtkCTree::node_get_pixmap().

Changed paths:
  M  NEWS
  M  generator/gtk.overrides


Diff:
c826cba4b486ed27291800fa8130755a2fe24ae9
diff --git a/NEWS b/NEWS
index d3801b6..fc5116f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-    - implemented GtkCTree methods node_get_pixtext() and get_node_info().
-      (Andrei)
+    - implemented GtkCTree methods node_get_pixtext(), node_get_pixmap(), and
+      get_node_info().  (Andrei)
     - implemented GtkObject::emit(), thus allowing programmatical emission of
       signals. (Andrei)
     - added support for accessing GtkObject arguments via get_arg() and
diff --git a/generator/gtk.overrides b/generator/gtk.overrides
index 954ee7f..eb43bcf 100644
--- a/generator/gtk.overrides
+++ b/generator/gtk.overrides
@@ -1278,33 +1278,10 @@ PHP_FUNCTION(wrap_gtk_ctree_get_node_info)
 		return;
 	}
 
-	if (pixmap_closed)
-		php_pixmap_closed = php_gdk_pixmap_new(pixmap_closed);
-	else {
-		MAKE_STD_ZVAL(php_pixmap_closed);
-		ZVAL_NULL(php_pixmap_closed);
-	}
-
-	if (pixmap_opened)
-		php_pixmap_opened = php_gdk_pixmap_new(pixmap_opened);
-	else {
-		MAKE_STD_ZVAL(php_pixmap_opened);
-		ZVAL_NULL(php_pixmap_opened);
-	}
-
-	if (mask_closed)
-		php_mask_closed = php_gdk_bitmap_new(mask_closed);
-	else {
-		MAKE_STD_ZVAL(php_mask_closed);
-		ZVAL_NULL(php_mask_closed);
-	}
-
-	if (mask_opened)
-		php_mask_opened = php_gdk_bitmap_new(mask_opened);
-	else {
-		MAKE_STD_ZVAL(php_mask_opened);
-		ZVAL_NULL(php_mask_opened);
-	}
+	php_pixmap_closed = php_gdk_pixmap_new(pixmap_closed);
+	php_pixmap_opened = php_gdk_pixmap_new(pixmap_opened);
+	php_mask_closed = php_gdk_bitmap_new(mask_closed);
+	php_mask_opened = php_gdk_bitmap_new(mask_opened);
 
 	*return_value = *php_gtk_build_value("(siNNNNbb)", text, (int)spacing,
 										 php_pixmap_closed, php_mask_closed,
@@ -1844,6 +1821,32 @@ PHP_FUNCTION(wrap_gtk_ctree_node_get_text)
 	RETURN_STRING(text, 1);
 }
 %%
+override gtk_ctree_node_get_pixmap
+PHP_FUNCTION(wrap_gtk_ctree_node_get_pixmap)
+{
+	zval *node, *php_pixmap, *php_mask;
+	int column;
+	GdkPixmap *pixmap = NULL;
+	GdkBitmap *mask = NULL;
+
+	NOT_STATIC_METHOD();
+
+	if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "Oi", &node, gtk_ctree_node_ce, &column))
+		return;
+
+	if (!gtk_ctree_node_get_pixmap(GTK_CTREE(PHP_GTK_GET(this_ptr)),
+								   PHP_GTK_CTREE_NODE_GET(node), column,
+								   &pixmap, &mask)) {
+		php_error(E_WARNING, "%s() cannot get pixmap value", get_active_function_name());
+		return;
+	}
+	
+	php_pixmap = php_gdk_pixmap_new(pixmap);
+	php_mask = php_gdk_bitmap_new(pixmap);
+
+	*return_value = *php_gtk_build_value("(NN)", php_pixmap, php_mask);
+}
+%%
 override gtk_ctree_node_get_pixtext
 PHP_FUNCTION(wrap_gtk_ctree_node_get_pixtext)
 {


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

[prev in list] [next in list] [prev in thread] [next in thread]