Forgot to commit latest sample changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -207,9 +207,9 @@ public:
|
|||||||
variant = m_list[row];
|
variant = m_list[row];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (col == 2)
|
if ((col == 2) || (col == 3))
|
||||||
{
|
{
|
||||||
variant = &m_bitmap;
|
variant << m_bitmap;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
wxString tmp;
|
wxString tmp;
|
||||||
@@ -484,16 +484,19 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
|
|||||||
wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_cell, 0 );
|
wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_cell, 0 );
|
||||||
dataview_left->AppendColumn( column );
|
dataview_left->AppendColumn( column );
|
||||||
dataview_left->AppendTextColumn( wxT("second"), 1 );
|
dataview_left->AppendTextColumn( wxT("second"), 1 );
|
||||||
dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapCell, 2 ) );
|
dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapCell, 2, 25 ) );
|
||||||
|
dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapCell, 3, 25 ) );
|
||||||
|
|
||||||
// Right wxDataViewCtrl using the sorting model
|
// Right wxDataViewCtrl using the sorting model
|
||||||
dataview_right = new wxDataViewCtrl( this, wxID_ANY );
|
dataview_right = new wxDataViewCtrl( this, wxID_ANY );
|
||||||
|
|
||||||
wxDataViewSortedListModel *sorted_model =
|
wxDataViewSortedListModel *sorted_model =
|
||||||
new wxDataViewSortedListModel( m_unsorted_model );
|
new wxDataViewSortedListModel( m_unsorted_model );
|
||||||
dataview_right->AssociateModel( sorted_model );
|
dataview_right->AssociateModel( sorted_model );
|
||||||
text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
|
text_cell = new wxDataViewTextCell( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
|
||||||
column = new wxDataViewColumn( wxT("editable"), text_cell, 0 );
|
column = new wxDataViewColumn( wxT("editable"), text_cell, 0, -1, wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE );
|
||||||
dataview_right->AppendColumn( column );
|
dataview_right->AppendColumn( column );
|
||||||
|
|
||||||
dataview_right->AppendTextColumn( wxT("second"), 1 );
|
dataview_right->AppendTextColumn( wxT("second"), 1 );
|
||||||
|
|
||||||
// layout dataview controls.
|
// layout dataview controls.
|
||||||
|
Reference in New Issue
Block a user