AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix drawing of cell editing controls with GTK3

Browse Source 
Get rid of the ugly and unnecessary hack of making the control a child
of the GtkTreeView "behind its back", which was a terrible idea and
bound to cause problems.
See #16850
This commit is contained in:
Paul Cornett 2015-04-24 09:52:47 -07:00
parent a634aab571
commit 4b9485a497
1 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/gtk/dataview.cpp
View File

@ -1350,7 +1350,8 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
wxDataViewItem
item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));
cell->StartEditing( item, renderrect );
if (cell->StartEditing(item, renderrect))
return GTK_CELL_EDITABLE(cell->GetEditorCtrl()->m_widget);
return NULL;
}
@ -4326,39 +4327,10 @@ wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter*
// wxDataViewCtrl
//-----------------------------------------------------------------------------
void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child)
void wxDataViewCtrl::AddChildGTK(wxWindowGTK*)
{
GtkWidget* treeview = GtkGetTreeView();
// Insert widget in GtkTreeView
if (gtk_widget_get_realized(treeview))
gtk_widget_set_parent_window( child->m_widget,
gtk_tree_view_get_bin_window( GTK_TREE_VIEW(treeview) ) );
gtk_widget_set_parent( child->m_widget, treeview );
}
static
void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
GtkAllocation *WXUNUSED(gtk_alloc),
wxDataViewCtrl *win )
{
wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
while (node)
{
wxWindow *child = node->GetData();
GtkRequisition req;
gtk_widget_get_preferred_size(child->m_widget, NULL, &req);
GtkAllocation alloc;
alloc.x = child->m_x;
alloc.y = child->m_y;
alloc.width = child->m_width;
alloc.height = child->m_height;
gtk_widget_size_allocate( child->m_widget, &alloc );
node = node->GetNext();
}
// this is for cell editing controls, which will be
// made children of the GtkTreeView automatically
}
@ -4515,9 +4487,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
m_focusWidget = GTK_WIDGET(m_treeview);
g_signal_connect (m_treeview, "size_allocate",
G_CALLBACK (gtk_dataviewctrl_size_callback), this);
bool fixed = (style & wxDV_VARIABLE_LINE_HEIGHT) == 0;
gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), fixed );