com gtk/php-gtk: GtkEditable::get_selection_bounds( ) GtkWidget::get_size_request() GtkMisc:: get_padding() GtkEntry::get_layout_offsets( ) GtkTreeView::tree_to_widget_coords() GtkT reeView::widget_to_tree_coords() GtkTextView: :window_to_buffer_coords() GtkTextView::buffe r_to_window_coords() GtkLayout::get_size( ) GtkScale::get_layout_offsets() GtkWidget: :translate_coordinates() GtkTreeViewColumn::cell _get_position(): ext/gtk+/gtk.overrides ext/gtk +/g

f89eed2a86f5be8a7c3a4b6c5dec4ca13dc33496
diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides
index 5f39a43..070a5fb 100644
--- a/ext/gtk+/gtk.overrides
+++ b/ext/gtk+/gtk.overrides
@@ -652,9 +652,8 @@ PHP_METHOD
 
     NOT_STATIC_METHOD();
 
-    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "")) {
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
         return;
-    }
 
     gtk_alignment_get_padding(GTK_ALIGNMENT(PHPG_GOBJECT(this_ptr)), &padding_top, &padding_bottom, &padding_left, &padding_right);
 
@@ -871,7 +870,7 @@ ZEND_END_ARG_INFO();
 override gtk_clist_get_selection_info
 PHP_METHOD
 {
-    gint x, y, row, column, retval;
+    gint x, y, row, column;
 
     NOT_STATIC_METHOD();
 
@@ -884,14 +883,11 @@ PHP_METHOD
 
     phpg_warn_deprecated(NULL TSRMLS_CC);
 
-    retval = gtk_clist_get_selection_info(GTK_CLIST(PHPG_GOBJECT(this_ptr)), x, y, &row, &column);
-
-    if (retval == 0) {
-        row = -1;
-        column = -1;
+    if (gtk_clist_get_selection_info(GTK_CLIST(PHPG_GOBJECT(this_ptr)), x, y, &row, &column) == 0) {
+        RETURN_FALSE;
+    } else {
+        php_gtk_build_value(&return_value, "(ii)", row, column);
     }
-
-    php_gtk_build_value(&return_value, "(ii)", row, column);
 }
 
 %% }}}
@@ -1082,6 +1078,52 @@ PHP_METHOD
 }
 %% }}}
 
+<<<<<<< gtk.overrides
+
+%% {{{ GtkEditable
+
+%%
+override gtk_editable_get_selection_bounds
+PHP_METHOD
+{
+    gint start, end;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    if (!gtk_editable_get_selection_bounds(GTK_EDITABLE(PHPG_GOBJECT(this_ptr)), &start, &end)) {
+        RETURN_FALSE;
+    } else {
+        php_gtk_build_value(&return_value, "(ii)", start, end);
+    }
+}
+
+%% }}}
+
+
+%% {{{ 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
 
 %%
@@ -1110,6 +1152,7 @@ PHP_METHOD
     
 %% }}}
 
+>>>>>>> 1.139
 %% {{{ GtkIconSet
 %%
 override gtk_icon_set_get_sizes
@@ -1362,6 +1405,27 @@ PHP_METHOD
 }
 %% }}}
 
+
+%% {{{ GtkLayout
+
+%%
+override gtk_layout_get_size
+PHP_METHOD
+{
+    gint width, height;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    gtk_layout_get_size(GTK_LAYOUT(PHPG_GOBJECT(this_ptr)), &width, &height);
+    php_gtk_build_value(&return_value, "(ii)", width, height);
+}
+
+%% }}}
+
+
 %% {{{ GtkMenu
 %%
 add-arginfo GtkMenu popup
@@ -1567,6 +1631,27 @@ PHP_METHOD
 }
 %% }}}
 
+
+%% {{{ GtkMisc
+
+%%
+override gtk_misc_get_padding
+PHP_METHOD
+{
+    gint xpad, ypad;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    gtk_misc_get_padding(GTK_MISC(PHPG_GOBJECT(this_ptr)), &xpad, &ypad);
+    php_gtk_build_value(&return_value, "(ii)", xpad, ypad);
+}
+
+%% }}}
+
+
 %% {{{ GtkProgressBar
 
 %%
@@ -1823,6 +1908,27 @@ PHP_METHOD
 }
 %% }}}
 
+
+%% {{{ GtkScale
+
+%%
+override gtk_scale_get_layout_offsets
+PHP_METHOD
+{
+    gint x, y;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    gtk_scale_get_layout_offsets(GTK_SCALE(PHPG_GOBJECT(this_ptr)), &x, &y);
+    php_gtk_build_value(&return_value, "(ii)", x, y);
+}
+
+%% }}}
+
+
 %% include gtkstyle.overrides
 
 %% {{{ GtkTextAttributes
@@ -1952,12 +2058,6 @@ PHP_METHOD
 
 
 %% {{{ GtkWidget
-%%
-add-arginfo GtkWidget intersect
-static
-ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
-    ZEND_ARG_OBJ_INFO(0, area, GdkRectangle, 1)
-ZEND_END_ARG_INFO();
 
 %%
 override gtk_widget_get_pointer
@@ -1975,12 +2075,35 @@ PHP_METHOD
 }
 
 %%
+override gtk_widget_get_size_request
+PHP_METHOD
+{
+    gint width, height;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
+        return;
+
+    gtk_widget_get_size_request(GTK_WIDGET(PHPG_GOBJECT(this_ptr)), &width, &height);
+    php_gtk_build_value(&return_value, "(ii)", width, height);
+}
+
+
+%%
+add-arginfo GtkWidget intersect
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_OBJ_INFO(0, area, GdkRectangle, 1)
+ZEND_END_ARG_INFO();
+
+%%
 override gtk_widget_intersect
 PHP_METHOD
 {
     zval *php_area;
     GdkRectangle area, intersection;
-    
+
     NOT_STATIC_METHOD();
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "V", &php_area))
@@ -1997,8 +2120,38 @@ PHP_METHOD
     }
 }
 
+
+%%
+add-arginfo GtkWidget translate_coordinates
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_OBJ_INFO(0, dest_widget, GtkWidget, 0)
+    ZEND_ARG_INFO(0, src_x)
+    ZEND_ARG_INFO(0, src_y)
+ZEND_END_ARG_INFO();
+
+%%
+override gtk_widget_translate_coordinates
+PHP_METHOD
+{
+    gint src_x, src_y, dest_x, dest_y;
+    zval *dest_widget;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "Oii", &dest_widget, gtkwidget_ce, &src_x, &src_y))
+        return;
+
+    if (gtk_widget_translate_coordinates(GTK_WIDGET(PHPG_GOBJECT(this_ptr)), GTK_WIDGET(PHPG_GOBJECT(dest_widget)), src_x, src_y, &dest_x, &dest_y)) {
+        php_gtk_build_value(&return_value, "(ii)", dest_x, dest_y);
+    } else {
+        RETURN_FALSE;
+    }
+}
+
 %% }}}
 
+
 %% {{{ GtkWindow
 %%
 override gtk_window_get_position
diff --git a/ext/gtk+/gtktextview.overrides b/ext/gtk+/gtktextview.overrides
index e2ab4ee..b98d2b9 100644
--- a/ext/gtk+/gtktextview.overrides
+++ b/ext/gtk+/gtktextview.overrides
@@ -153,3 +153,67 @@ PHP_METHOD
 }
 
 %% }}}
+
+
+%% {{{ GtkTextView
+
+%%
+add-arginfo GtkTextView buffer_to_window_coords
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_INFO(0, window_type)
+    ZEND_ARG_INFO(0, buffer_x)
+    ZEND_ARG_INFO(0, buffer_y)
+ZEND_END_ARG_INFO();
+
+%%
+override gtk_text_view_buffer_to_window_coords
+PHP_METHOD
+{
+    gint buffer_x, buffer_y, window_x, window_y;
+    GtkTextWindowType win_type;
+    zval *php_win_type = NULL;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "Vii", &php_win_type, &buffer_x, &buffer_y))
+        return;
+
+    if (php_win_type && phpg_gvalue_get_enum(GTK_TYPE_TEXT_WINDOW_TYPE, php_win_type, (gint *)&win_type) == FAILURE)
+        return;
+
+    gtk_text_view_buffer_to_window_coords(GTK_TEXT_VIEW(PHPG_GOBJECT(this_ptr)), win_type, buffer_x, buffer_y, &window_x, &window_y);
+    php_gtk_build_value(&return_value, "(ii)", window_x, window_y);
+}
+
+
+%%
+add-arginfo GtkTextView window_to_buffer_coords
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_INFO(0, window_type)
+    ZEND_ARG_INFO(0, window_x)
+    ZEND_ARG_INFO(0, window_y)
+ZEND_END_ARG_INFO();
+
+%%
+override gtk_text_view_window_to_buffer_coords
+PHP_METHOD
+{
+    gint window_x, window_y, buffer_x, buffer_y;
+    GtkTextWindowType win_type;
+    zval *php_win_type = NULL;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "Vii", &php_win_type, &window_x, &window_y))
+        return;
+
+    if (php_win_type && phpg_gvalue_get_enum(GTK_TYPE_TEXT_WINDOW_TYPE, php_win_type, (gint *)&win_type) == FAILURE)
+        return;
+
+    gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(PHPG_GOBJECT(this_ptr)), win_type, window_x, window_y, &buffer_x, &buffer_y);
+    php_gtk_build_value(&return_value, "(ii)", buffer_x, buffer_y);
+}
+
+%% }}}
diff --git a/ext/gtk+/gtktreeview.overrides b/ext/gtk+/gtktreeview.overrides
index c6dbc5c..28081ba 100644
--- a/ext/gtk+/gtktreeview.overrides
+++ b/ext/gtk+/gtktreeview.overrides
@@ -919,8 +919,57 @@ PHP_METHOD
     add_next_index_long(return_value, cell_y);
 }
 
+
+%%
+add-arginfo GtkTreeView tree_to_widget_coords
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_INFO(0, tx)
+    ZEND_ARG_INFO(0, ty)
+ZEND_END_ARG_INFO();
+
+%%
+override gtk_tree_view_tree_to_widget_coords
+PHP_METHOD
+{
+    gint tx, ty, wx, wy;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "ii", &tx, &ty))
+        return;
+
+    gtk_tree_view_tree_to_widget_coords(GTK_TREE_VIEW(PHPG_GOBJECT(this_ptr)), tx, ty, &wx, &wy);
+    php_gtk_build_value(&return_value, "(ii)", wx, wy);
+}
+
+
+%%
+add-arginfo GtkTreeView widget_to_tree_coords
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_INFO(0, wx)
+    ZEND_ARG_INFO(0, wy)
+ZEND_END_ARG_INFO();
+
+%%
+override gtk_tree_view_widget_to_tree_coords
+PHP_METHOD
+{
+    gint wx, wy, tx, ty;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "ii", &wx, &wy))
+        return;
+
+    gtk_tree_view_widget_to_tree_coords(GTK_TREE_VIEW(PHPG_GOBJECT(this_ptr)), wx, wy, &tx, &ty);
+    php_gtk_build_value(&return_value, "(ii)", tx, ty);
+}
+
 %% }}}
 
+
 %% {{{ GtkTreeViewColumn
 
 %%
@@ -997,6 +1046,35 @@ PHP_METHOD
     phpg_gobject_set_wrapper(this_ptr, (GObject *)tvc TSRMLS_CC);
 }
 
+
+
+%%
+add-arginfo GtkTreeViewColumn cell_get_position
+static
+ZEND_BEGIN_ARG_INFO(ARGINFO_NAME, 0)
+    ZEND_ARG_OBJ_INFO(0, cellrenderer, GtkCellRenderer, 1)
+ZEND_END_ARG_INFO();
+
+%%
+override gtk_tree_view_column_cell_get_position
+PHP_METHOD
+{
+    gint start_pos, width;
+    zval *cellrenderer;
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "O", &cellrenderer, gtkcellrenderer_ce))
+        return;
+
+    if (gtk_tree_view_column_cell_get_position(GTK_TREE_VIEW_COLUMN(PHPG_GOBJECT(this_ptr)), GTK_CELL_RENDERER(PHPG_GOBJECT(cellrenderer)), &start_pos, &width)) {
+        php_gtk_build_value(&return_value, "(ii)", start_pos, width);
+    } else {
+        RETURN_FALSE;
+    }
+}
+
+
 %%
 add-arginfo GtkTreeViewColumn set_cell_data_func
 static