|
||||||||||
|
New in This Group Dear php-gtk-cvs@lists.php.net 73% 0FF on Pfizer.11/14/2009 3:38:00 AM php-gtk on windows11/29/2008 5:24:26 PM cvs: php-gtk /ext/html html.defs9/23/2008 11:45:15 PM cvs: php-gtk / config.m49/23/2008 4:13:59 PM cvs: php-gtk /main phpg_gobject.c9/21/2008 10:39:53 PM cvs: php-gtk /main php_gtk.h5/11/2008 4:30:08 PM cvs: php-gtk /main php_gtk.h5/1/2008 11:35:27 PM cvs: php-gtk / README.KNOWN-ISSUES2/29/2008 6:40:07 PM cvs: php-gtk / NEWS2/29/2008 6:37:05 PM cvs: php-gtk / ChangeLog2/29/2008 6:32:33 PM |
svn: /gtk/php-gtk/trunk/ext/gtk+/ gtk-2.18.defs gtk-2.18.overrides
|
|||||||||
| Group: php.gtk.cvs |
Subscribe
|
Posted:10/8/2009 3:16:23 PM | Replies:0 | Views:8 | Items(0) |
|
--34cd23de76c0d97bf19a5ba082e8ebe18c87ffe7
Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit auroraeosrose Thu, 08 Oct 2009 15:16:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289346 Log: Fixed defs and overrides for 2.18 items that don't generate - all 2.18 symbols are now done (need tests yet) Changed paths: U gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.defs U gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.overrides Modified: gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.defs =================================================================== --- gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.defs 2009-10-08 15:10:18 UTC (rev 289345) +++ gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.defs 2009-10-08 15:16:23 UTC (rev 289346) @@ -41,8 +41,8 @@ (c-name "gtk_cell_renderer_set_alignment") (return-type "none") (parameters - '("gfloat*" "xalign") - '("gfloat*" "yalign") + '("gfloat" "xalign") + '("gfloat" "yalign") ) ) @@ -51,8 +51,8 @@ (c-name "gtk_cell_renderer_set_padding") (return-type "none") (parameters - '("gfloat*" "xpad") - '("gfloat*" "ypad") + '("gfloat" "xpad") + '("gfloat" "ypad") ) ) @@ -86,7 +86,7 @@ (define-method get_activatable (of-object "GtkCellRendererToggle") (c-name "gtk_cell_renderer_toggle_get_activatable") - (return-type "boolean") + (return-type "gboolean") ) ;; From gtkentrybuffer.h @@ -125,7 +125,7 @@ (define-method get_bytes (of-object "GtkEntryBuffer") (c-name "gtk_entry_buffer_get_bytes") - (return-type "gsize") + (return-type "guint") ) (define-method get_length @@ -224,7 +224,7 @@ (define-method get_create_folders (of-object "GtkFileChooser") (c-name "gtk_file_chooser_get_create_folders") - (return-type "boolean") + (return-type "gboolean") ) ;; From gtkiconview.h Modified: gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.overrides =================================================================== --- gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.overrides 2009-10-08 15:10:18 UTC (rev 289345) +++ gtk/php-gtk/trunk/ext/gtk+/gtk-2.18.overrides 2009-10-08 15:16:23 UTC (rev 289346) @@ -1,5 +1,93 @@ %% include gtk-2.12.overrides +%% {{{ GtkCellRenderer + +%% +override gtk_cell_renderer_get_alignment +PHP_METHOD +{ + gfloat xalign = 0, yalign = 0; + + NOT_STATIC_METHOD(); + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "")) + return; + + gtk_cell_renderer_get_alignment(GTK_CELL_RENDERER(PHPG_GOBJECT(this_ptr)), &xalign, &yalign); + + array_init(return_value); + add_next_index_double(return_value, xalign); + add_next_index_double(return_value, yalign); +} + +%% +override gtk_cell_renderer_get_padding +PHP_METHOD +{ + gfloat xpad = 0, ypad = 0; + + NOT_STATIC_METHOD(); + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "")) + return; + + gtk_cell_renderer_get_padding(GTK_CELL_RENDERER(PHPG_GOBJECT(this_ptr)), &xpad, &ypad); + + array_init(return_value); + add_next_index_double(return_value, xpad); + add_next_index_double(return_value, ypad); +} + +%% }}} + +%% {{{ GtkInfoBar + +%% +add-arginfo GtkInfoBar add_buttons +PHPGTK_ARG_INFO_STATIC +ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0) + ZEND_ARG_INFO(0, buttons) +ZEND_END_ARG_INFO(); + +%% +override gtk_info_bar_add_buttons +PHP_METHOD +{ + zval *buttons = NULL; + zval **text, **response; + + NOT_STATIC_METHOD(); + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a", &buttons)) + return; + + + if (zend_hash_num_elements(Z_ARRVAL_P(buttons)) % 2) { + php_error(E_WARNING, + "%s::%s(): button list has to contain pairs of items", + get_active_class_name(NULL TSRMLS_CC), + get_active_function_name(TSRMLS_C)); + return; + } + + zend_hash_internal_pointer_reset(Z_ARRVAL_P(buttons)); + while (zend_hash_get_current_data(Z_ARRVAL_P(buttons), (void **)&text) == SUCCESS) { + zend_hash_move_forward(Z_ARRVAL_P(buttons)); + zend_hash_get_current_data(Z_ARRVAL_P(buttons), (void **)&response); /* safe */ + zend_hash_move_forward(Z_ARRVAL_P(buttons)); + + if (Z_TYPE_PP(text) != IS_STRING || Z_TYPE_PP(response) != IS_LONG) { + php_error(E_WARNING, "%s::%s(): each pair in button list has to be string/number", + get_active_class_name(NULL TSRMLS_CC), get_active_function_name(TSRMLS_C)); + return; + } + + gtk_info_bar_add_button(GTK_INFO_BAR(PHPG_GOBJECT(this_ptr)), Z_STRVAL_PP(text), Z_LVAL_PP(response)); + } +} + +%% }}} + %% {{{ GtkWidget %% --34cd23de76c0d97bf19a5ba082e8ebe18c87ffe7-- |
auroraeosr...@php.net (=?utf-8?q?Elizabeth_Marie_Smith?=) 10/8/2009 3:16:23 PM |
note 97095 added to soapclient.soapclient
note 97094 added to function.sqlite-changes
note 97093 added to function.sqlite-changes
note 97092 added to ref.xmlrpc
note 97091 added to function.var-export