Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of unused renderer rect in gtk_wx_cell_renderer_new()

Browse Source 
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 1e510b1e2d
This commit is contained in:
Vadim Zeitlin
2017-12-31 02:33:26 +01:00
parent bf09ff2320
commit bde62ce981
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/dataview.cpp
View File

@@ -1420,7 +1420,7 @@ gtk_wx_cell_renderer_new (void)
static GtkCellEditable *gtk_wx_cell_renderer_start_editing( static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
GtkCellRenderer *renderer, GtkCellRenderer *renderer,
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
GtkWidget *widget, GtkWidget *WXUNUSED(widget),
const gchar *path, const gchar *path,
wxConstGdkRect *WXUNUSED(background_area), wxConstGdkRect *WXUNUSED(background_area),
wxConstGdkRect *cell_area, wxConstGdkRect *cell_area,
@@ -1437,25 +1437,10 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
if (cell->GetEditorCtrl()) if (cell->GetEditorCtrl())
return NULL; 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 wxDataViewItem
item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path))); item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));
if (!cell->StartEditing(item, renderrect)) if (!cell->StartEditing(item, wxRectFromGDKRect(cell_area)))
return NULL; return NULL;
wxrenderer->editor_bin = gtk_wx_cell_editor_bin_new(cell->GetEditorCtrl()); wxrenderer->editor_bin = gtk_wx_cell_editor_bin_new(cell->GetEditorCtrl());