cvs: php-gtk /ext/gtk+ gtk.overrides

fmk Thu Jan 3 15:33:41 2002 EDT Modified files: /php-gtk/ext/gtk+ gtk.overrides Log: Fixing GtkCombo to use UTF-8 convertion on Win32 Index: php-gtk/ext/gtk+/gtk.overrides diff -u php-gtk/ext/gtk+/gtk.overrides:1.40 php-gtk/ext/gtk+/gtk.overrides:1.41 --- php-gtk/ext/gtk+/gtk.overrides:1.40 Wed Dec 19 12:19:26 2001 +++ php-gtk/ext/gtk+/gtk.overrides Thu Jan 3 15:33:40 2002 @@ -1050,6 +1050,9 @@ { zval *php_list, **item; GList *list = NULL; +#ifdef PHP_WIN32 + gchar *utf8_text = NULL; +#endif NOT_STATIC_METHOD(); @@ -1059,7 +1062,13 @@ zend_hash_internal_pointer_reset(Z_ARRVAL_P(php_list)); while (zend_hash_get_current_data(Z_ARRVAL_P(php_list), (void **)&item) == SUCCESS) { convert_to_string_ex(item); +#ifdef PHP_WIN32 + utf8_text = g_convert(Z_STRVAL_PP(item), Z_STRLEN_PP(item), "UTF-8", GTK_G(codepage), NULL, NULL, NULL); + list = g_list_append(list, utf8_text); + if (utf8_text) g_free(utf8_text); +#else list = g_list_append(list, Z_STRVAL_PP(item)); +#endif zend_hash_move_forward(Z_ARRVAL_P(php_list)); }