From bde62ce981271fdd93c94909ba2f543e6c75c568 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 31 Dec 2017 02:33:26 +0100 Subject: [PATCH] Get rid of unused renderer rect in gtk_wx_cell_renderer_new() No real changes, just don't call gtk_wx_cell_renderer_get_size() unnecessarily as we never use its result: the code using the returned rectangle was commented out ever since it was added (more than 10 years ago) in 1e510b1e2d0270caf227c3fc0cf34ae2e7dd6794 --- src/gtk/dataview.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index f72a4518fc..edd9dbcd08 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -1420,7 +1420,7 @@ gtk_wx_cell_renderer_new (void) static GtkCellEditable *gtk_wx_cell_renderer_start_editing( GtkCellRenderer *renderer, GdkEvent *WXUNUSED(event), - GtkWidget *widget, + GtkWidget *WXUNUSED(widget), const gchar *path, wxConstGdkRect *WXUNUSED(background_area), wxConstGdkRect *cell_area, @@ -1437,25 +1437,10 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing( if (cell->GetEditorCtrl()) return NULL; - GdkRectangle rect; - gtk_wx_cell_renderer_get_size (renderer, widget, cell_area, - &rect.x, - &rect.y, - &rect.width, - &rect.height); - - rect.x += cell_area->x; - rect.y += cell_area->y; -// rect.width -= renderer->xpad * 2; -// rect.height -= renderer->ypad * 2; - -// wxRect renderrect(wxRectFromGDKRect(&rect)); - wxRect renderrect(wxRectFromGDKRect(cell_area)); - wxDataViewItem item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path))); - if (!cell->StartEditing(item, renderrect)) + if (!cell->StartEditing(item, wxRectFromGDKRect(cell_area))) return NULL; wxrenderer->editor_bin = gtk_wx_cell_editor_bin_new(cell->GetEditorCtrl());