com gtk/php-gtk: Reflection information for Andrei's GtkEntry constructor: ext/gtk+/gtk.overrides

[email protected] (David Soria Parra) Sat, 14 Jan 2006 09:24:56 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    c55024e2002aabb5319a446947c8a40d4b8704ad
Author:    Christian Weiske <[email protected]>         Sat, 14 Jan 2006 09:24:56 +0000
Parents:   f89eed2a86f5be8a7c3a4b6c5dec4ca13dc33496
Branches:  master

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

Log:
Reflection information for Andrei's GtkEntry constructor

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


Diff:
c55024e2002aabb5319a446947c8a40d4b8704ad
diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides
index 070a5fb..bfe48d5 100644
--- a/ext/gtk+/gtk.overrides
+++ b/ext/gtk+/gtk.overrides
@@ -1078,7 +1078,6 @@ PHP_METHOD
 }
 %% }}}
 
-<<<<<<< gtk.overrides
 
 %% {{{ GtkEditable
 
@@ -1106,25 +1105,12 @@ PHP_METHOD
 %% {{{ GtkEntry
 
 %%
-override gtk_entry_get_layout_offsets
-PHP_METHOD
-{
-    gint x, y;
-
-    NOT_STATIC_METHOD();
-
-    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
-        return;
-
-    gtk_entry_get_layout_offsets(GTK_ENTRY(PHPG_GOBJECT(this_ptr)), &x, &y);
-    php_gtk_build_value(&return_value, "(ii)", x, y);
-}
-
-%% }}}
-
-
-=======
-%% {{{ GtkEntry
+add-arginfo GtkEntry __construct
+static
+ZEND_BEGIN_ARG_INFO_EX(ARGINFO_NAME, 0, 0, 0)
+    ZEND_ARG_INFO(0, text)
+    ZEND_ARG_INFO(0, max_length)
+ZEND_END_ARG_INFO();
 
 %%
 override gtk_entry_new
@@ -1144,15 +1130,30 @@ PHP_METHOD
 
     if (free_text) g_free(text);
 
-	if (!wrapped_obj) {
+    if (!wrapped_obj) {
         PHPG_THROW_CONSTRUCT_EXCEPTION(GtkEntry);
-	}
+    }
     phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC);
 }
-    
+
+%%
+override gtk_entry_get_layout_offsets
+PHP_METHOD
+{
+    gint x, y;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    gtk_entry_get_layout_offsets(GTK_ENTRY(PHPG_GOBJECT(this_ptr)), &x, &y);
+    php_gtk_build_value(&return_value, "(ii)", x, y);
+}
+
 %% }}}
 
->>>>>>> 1.139
+
 %% {{{ GtkIconSet
 %%
 override gtk_icon_set_get_sizes