X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a53f722ff298f81f92a0f65b6fdf864c20afc376..c29c95fe24973b94fd724db767193171ca7c513d:/samples/dataview/dataview.cpp diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 3f0db083cc..f3c8bb2074 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -6,7 +6,7 @@ // Created: 06/01/06 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -71,8 +71,8 @@ public: unsigned int nPanel, unsigned long style = 0); -public: // event handlers - +private: + // event handlers void OnStyleChange(wxCommandEvent& event); void OnSetBackgroundColour(wxCommandEvent& event); void OnSetForegroundColour(wxCommandEvent& event); @@ -83,11 +83,13 @@ public: // event handlers void OnPageChanged(wxBookCtrlEvent& event); void OnAddMozart(wxCommandEvent& event); - void OnDeleteMusic(wxCommandEvent& event); + void OnDeleteSelected(wxCommandEvent& event); void OnDeleteYear(wxCommandEvent& event); void OnSelectNinth(wxCommandEvent& event); void OnCollapse(wxCommandEvent& event); void OnExpand(wxCommandEvent& event); + void OnShowCurrent(wxCommandEvent& event); + void OnSetNinthCurrent(wxCommandEvent& event); void OnPrependList(wxCommandEvent& event); void OnDeleteList(wxCommandEvent& event); @@ -111,20 +113,29 @@ public: // event handlers void OnEditingDone( wxDataViewEvent &event ); void OnHeaderClick( wxDataViewEvent &event ); + void OnAttrHeaderClick( wxDataViewEvent &event ); void OnHeaderRightClick( wxDataViewEvent &event ); void OnSorted( wxDataViewEvent &event ); void OnContextMenu( wxDataViewEvent &event ); - void OnRightClick( wxMouseEvent &event ); void OnGoto( wxCommandEvent &event); void OnAddMany( wxCommandEvent &event); + void OnHideAttributes( wxCommandEvent &event); + void OnShowAttributes( wxCommandEvent &event); +#if wxUSE_DRAG_AND_DROP void OnBeginDrag( wxDataViewEvent &event ); void OnDropPossible( wxDataViewEvent &event ); void OnDrop( wxDataViewEvent &event ); +#endif // wxUSE_DRAG_AND_DROP + + void OnDataViewChar(wxKeyEvent& event); + + // helper used by both OnDeleteSelected() and OnDataViewChar() + void DeleteSelectedItems(); + -private: wxNotebook* m_notebook; // the controls stored in the various tabs of the main notebook: @@ -139,6 +150,7 @@ private: // other data: wxDataViewColumn* m_col; + wxDataViewColumn* m_attributes; wxTextCtrl* m_log; wxLog *m_logOld; @@ -177,7 +189,7 @@ public: return true; } - virtual bool Activate( wxRect WXUNUSED(cell), + virtual bool Activate( const wxRect& WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) @@ -186,7 +198,8 @@ public: return false; } - virtual bool LeftClick( wxPoint cursor, wxRect WXUNUSED(cell), + virtual bool LeftClick(const wxPoint& cursor, + const wxRect& WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) @@ -230,7 +243,6 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame(NULL, "wxDataViewCtrl sample", 40, 40, 1000, 540); - SetTopWindow(frame); frame->Show(true); return true; @@ -264,18 +276,24 @@ enum // control IDs ID_MUSIC_CTRL = 50, + ID_ATTR_CTRL = 51, ID_ADD_MOZART = 100, - ID_DELETE_MUSIC = 101, + ID_DELETE_SEL = 101, ID_DELETE_YEAR = 102, ID_SELECT_NINTH = 103, ID_COLLAPSE = 104, ID_EXPAND = 105, + ID_SHOW_CURRENT, + ID_SET_NINTH_CURRENT, ID_PREPEND_LIST = 200, ID_DELETE_LIST = 201, ID_GOTO = 202, ID_ADD_MANY = 203, + ID_HIDE_ATTRIBUTES = 204, + ID_SHOW_ATTRIBUTES = 205, + // Fourth page. ID_DELETE_TREE_ITEM = 400, ID_DELETE_ALL_TREE_ITEMS = 401, @@ -295,16 +313,20 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_NOTEBOOK_PAGE_CHANGED( wxID_ANY, MyFrame::OnPageChanged ) EVT_BUTTON( ID_ADD_MOZART, MyFrame::OnAddMozart ) - EVT_BUTTON( ID_DELETE_MUSIC, MyFrame::OnDeleteMusic ) + EVT_BUTTON( ID_DELETE_SEL, MyFrame::OnDeleteSelected ) EVT_BUTTON( ID_DELETE_YEAR, MyFrame::OnDeleteYear ) EVT_BUTTON( ID_SELECT_NINTH, MyFrame::OnSelectNinth ) EVT_BUTTON( ID_COLLAPSE, MyFrame::OnCollapse ) EVT_BUTTON( ID_EXPAND, MyFrame::OnExpand ) + EVT_BUTTON( ID_SHOW_CURRENT, MyFrame::OnShowCurrent ) + EVT_BUTTON( ID_SET_NINTH_CURRENT, MyFrame::OnSetNinthCurrent ) EVT_BUTTON( ID_PREPEND_LIST, MyFrame::OnPrependList ) EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList ) EVT_BUTTON( ID_GOTO, MyFrame::OnGoto) EVT_BUTTON( ID_ADD_MANY, MyFrame::OnAddMany) + EVT_BUTTON( ID_HIDE_ATTRIBUTES, MyFrame::OnHideAttributes) + EVT_BUTTON( ID_SHOW_ATTRIBUTES, MyFrame::OnShowAttributes) // Fourth page. EVT_BUTTON( ID_DELETE_TREE_ITEM, MyFrame::OnDeleteTreeItem ) EVT_BUTTON( ID_DELETE_ALL_TREE_ITEMS, MyFrame::OnDeleteAllTreeItems ) @@ -330,11 +352,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_DATAVIEW_ITEM_CONTEXT_MENU(ID_MUSIC_CTRL, MyFrame::OnContextMenu) +#if wxUSE_DRAG_AND_DROP EVT_DATAVIEW_ITEM_BEGIN_DRAG( ID_MUSIC_CTRL, MyFrame::OnBeginDrag ) EVT_DATAVIEW_ITEM_DROP_POSSIBLE( ID_MUSIC_CTRL, MyFrame::OnDropPossible ) EVT_DATAVIEW_ITEM_DROP( ID_MUSIC_CTRL, MyFrame::OnDrop ) +#endif // wxUSE_DRAG_AND_DROP + + EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnAttrHeaderClick) - EVT_RIGHT_UP(MyFrame::OnRightClick) END_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h): @@ -363,7 +388,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int wxMenu *file_menu = new wxMenu; file_menu->Append(ID_CLEARLOG, "&Clear log\tCtrl-L"); - file_menu->Append(ID_FOREGROUND_COLOUR, "Set &foreground colour...\tCtrl-F"); + file_menu->Append(ID_FOREGROUND_COLOUR, "Set &foreground colour...\tCtrl-S"); file_menu->Append(ID_BACKGROUND_COLOUR, "Set &background colour...\tCtrl-B"); file_menu->Append(ID_STYLE_MENU, "&Style", style_menu); file_menu->AppendSeparator(); @@ -380,6 +405,14 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int CreateStatusBar(); + // redirect logs from our event handlers to text control + m_log = new wxTextCtrl( this, wxID_ANY, wxString(), wxDefaultPosition, + wxDefaultSize, wxTE_MULTILINE ); + m_log->SetMinSize(wxSize(-1, 100)); + m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log)); + wxLogMessage( "This is the log window" ); + + // first page of the notebook // -------------------------- @@ -389,13 +422,21 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int BuildDataViewCtrl(firstPanel, 0); // sets m_ctrl[0] + const wxSizerFlags border = wxSizerFlags().DoubleBorder(); + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); - button_sizer->Add( new wxButton( firstPanel, ID_ADD_MOZART, "Add Mozart"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( firstPanel, ID_DELETE_MUSIC,"Delete selected"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( firstPanel, ID_DELETE_YEAR, "Delete \"Year\" column"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( firstPanel, ID_SELECT_NINTH,"Select ninth symphony"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( firstPanel, ID_COLLAPSE, "Collapse"), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( firstPanel, ID_EXPAND, "Expand"), 0, wxALL, 10 ); + button_sizer->Add( new wxButton( firstPanel, ID_ADD_MOZART, "Add Mozart"), border ); + button_sizer->Add( new wxButton( firstPanel, ID_DELETE_SEL, "Delete selected"), border ); + button_sizer->Add( new wxButton( firstPanel, ID_DELETE_YEAR, "Delete \"Year\" column"), border ); + button_sizer->Add( new wxButton( firstPanel, ID_SELECT_NINTH,"Select ninth symphony"), border ); + button_sizer->Add( new wxButton( firstPanel, ID_COLLAPSE, "Collapse"), border ); + button_sizer->Add( new wxButton( firstPanel, ID_EXPAND, "Expand"), border ); + + wxBoxSizer *sizerCurrent = new wxBoxSizer(wxHORIZONTAL); + sizerCurrent->Add(new wxButton(firstPanel, ID_SHOW_CURRENT, + "&Show current"), border); + sizerCurrent->Add(new wxButton(firstPanel, ID_SET_NINTH_CURRENT, + "Make &ninth symphony current"), border); wxSizer *firstPanelSz = new wxBoxSizer( wxVERTICAL ); m_ctrl[0]->SetMinSize(wxSize(-1, 200)); @@ -404,6 +445,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int new wxStaticText(firstPanel, wxID_ANY, "Most of the cells above are editable!"), 0, wxGROW|wxALL, 5); firstPanelSz->Add(button_sizer); + firstPanelSz->Add(sizerCurrent); firstPanel->SetSizerAndFit(firstPanelSz); @@ -415,10 +457,12 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int BuildDataViewCtrl(secondPanel, 1); // sets m_ctrl[1] wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL ); - button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,"Prepend"), 0, wxALL, 10 ); - button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, "Delete selected"), 0, wxALL, 10 ); - button_sizer2->Add( new wxButton( secondPanel, ID_GOTO, "Goto 50"), 0, wxALL, 10 ); - button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY, "Add 1000"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,"Prepend"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, "Delete selected"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_GOTO, "Goto 50"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY, "Add 1000"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_HIDE_ATTRIBUTES, "Hide attributes"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_SHOW_ATTRIBUTES, "Show attributes"), 0, wxALL, 10 ); wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL ); secondPanelSz->Add(m_ctrl[1], 1, wxGROW|wxALL, 5); @@ -468,12 +512,6 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int wxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); - m_log = new wxTextCtrl( this, wxID_ANY, wxString(), wxDefaultPosition, - wxDefaultSize, wxTE_MULTILINE ); - m_log->SetMinSize(wxSize(-1, 100)); - m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log)); - wxLogMessage( "This is the log window" ); - mainSizer->Add( m_notebook, 1, wxGROW ); mainSizer->Add( m_log, 0, wxGROW ); @@ -495,12 +533,17 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l m_ctrl[0] = new wxDataViewCtrl( parent, ID_MUSIC_CTRL, wxDefaultPosition, wxDefaultSize, style ); + m_ctrl[0]->Connect(wxEVT_CHAR, + wxKeyEventHandler(MyFrame::OnDataViewChar), + NULL, this); m_music_model = new MyMusicTreeModel; m_ctrl[0]->AssociateModel( m_music_model.get() ); +#if wxUSE_DRAG_AND_DROP && wxUSE_UNICODE m_ctrl[0]->EnableDragSource( wxDF_UNICODETEXT ); m_ctrl[0]->EnableDropTarget( wxDF_UNICODETEXT ); +#endif // wxUSE_DRAG_AND_DROP && wxUSE_UNICODE // column 0 of the view control: @@ -569,7 +612,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l case 1: { wxASSERT(!m_ctrl[1] && !m_list_model); - m_ctrl[1] = new wxDataViewCtrl( parent, wxID_ANY, wxDefaultPosition, + m_ctrl[1] = new wxDataViewCtrl( parent, ID_ATTR_CTRL, wxDefaultPosition, wxDefaultSize, style ); m_list_model = new MyListModel; @@ -578,15 +621,21 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l // the various columns m_ctrl[1]->AppendTextColumn("editable string", MyListModel::Col_EditableText, - wxDATAVIEW_CELL_EDITABLE); + wxDATAVIEW_CELL_EDITABLE, + wxCOL_WIDTH_AUTOSIZE); m_ctrl[1]->AppendIconTextColumn("icon", MyListModel::Col_IconText, - wxDATAVIEW_CELL_EDITABLE); - m_ctrl[1]->AppendColumn( + wxDATAVIEW_CELL_EDITABLE, + wxCOL_WIDTH_AUTOSIZE); + + m_attributes = new wxDataViewColumn("attributes", new wxDataViewTextRenderer, - MyListModel::Col_TextWithAttr) - ); + MyListModel::Col_TextWithAttr, + wxCOL_WIDTH_AUTOSIZE, + wxALIGN_RIGHT, + wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); + m_ctrl[1]->AppendColumn( m_attributes ); m_ctrl[1]->AppendColumn( new wxDataViewColumn("custom renderer", @@ -604,6 +653,10 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l wxDefaultSize, style ); m_ctrl[2] = lc; + MyListStoreDerivedModel* page2_model = new MyListStoreDerivedModel(); + lc->AssociateModel(page2_model); + page2_model->DecRef(); + lc->AppendToggleColumn( "Toggle" ); lc->AppendTextColumn( "Text" ); lc->AppendProgressColumn( "Progress" ); @@ -775,6 +828,8 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) // MyFrame - event handlers for the first page // ---------------------------------------------------------------------------- +#if wxUSE_DRAG_AND_DROP + void MyFrame::OnBeginDrag( wxDataViewEvent &event ) { wxDataViewItem item( event.GetItem() ); @@ -827,12 +882,14 @@ void MyFrame::OnDrop( wxDataViewEvent &event ) wxLogMessage( "Text dropped: %s", obj.GetText() ); } +#endif // wxUSE_DRAG_AND_DROP + void MyFrame::OnAddMozart( wxCommandEvent& WXUNUSED(event) ) { - m_music_model->AddToClassical( "Kleine Nachtmusik", "Wolfgang Mozart", 1787 ); + m_music_model->AddToClassical( "Eine kleine Nachtmusik", "Wolfgang Mozart", 1787 ); } -void MyFrame::OnDeleteMusic( wxCommandEvent& WXUNUSED(event) ) +void MyFrame::DeleteSelectedItems() { wxDataViewItemArray items; int len = m_ctrl[0]->GetSelections( items ); @@ -841,6 +898,11 @@ void MyFrame::OnDeleteMusic( wxCommandEvent& WXUNUSED(event) ) m_music_model->Delete( items[i] ); } +void MyFrame::OnDeleteSelected( wxCommandEvent& WXUNUSED(event) ) +{ + DeleteSelectedItems(); +} + void MyFrame::OnDeleteYear( wxCommandEvent& WXUNUSED(event) ) { m_ctrl[0]->DeleteColumn( m_ctrl[0]->GetColumn( 2 ) ); @@ -872,20 +934,42 @@ void MyFrame::OnExpand( wxCommandEvent& WXUNUSED(event) ) m_ctrl[0]->Expand( item ); } -void MyFrame::OnValueChanged( wxDataViewEvent &event ) +void MyFrame::OnShowCurrent(wxCommandEvent& WXUNUSED(event)) { - if (!m_log) + wxDataViewItem item = m_ctrl[0]->GetCurrentItem(); + if ( item.IsOk() ) + { + wxLogMessage("Current item: \"%s\" by %s", + m_music_model->GetTitle(item), + m_music_model->GetArtist(item)); + } + else + { + wxLogMessage("There is no current item."); + } +} + +void MyFrame::OnSetNinthCurrent(wxCommandEvent& WXUNUSED(event)) +{ + wxDataViewItem item(m_music_model->GetNinthItem()); + if ( !item.IsOk() ) + { + wxLogError( "Cannot make the ninth symphony current: it was removed!" ); return; + } - wxLogMessage( "wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d; Column: %d", - event.GetItem().GetID(), event.GetColumn() ); + m_ctrl[0]->SetCurrentItem(item); } -void MyFrame::OnActivated( wxDataViewEvent &event ) +void MyFrame::OnValueChanged( wxDataViewEvent &event ) { - if(!m_log) - return; + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage( "wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %s; Column: %d", + title, event.GetColumn() ); +} +void MyFrame::OnActivated( wxDataViewEvent &event ) +{ wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s", title ); @@ -897,9 +981,6 @@ void MyFrame::OnActivated( wxDataViewEvent &event ) void MyFrame::OnSelectionChanged( wxDataViewEvent &event ) { - if(!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); if (title.empty()) title = "None"; @@ -909,9 +990,6 @@ void MyFrame::OnSelectionChanged( wxDataViewEvent &event ) void MyFrame::OnExpanding( wxDataViewEvent &event ) { - if (!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, Item: %s", title ); } @@ -924,9 +1002,6 @@ void MyFrame::OnStartEditing( wxDataViewEvent &event ) { event.Veto(); - if (!m_log) - return; - wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING vetoed. Artist: %s", artist ); } else @@ -936,54 +1011,36 @@ void MyFrame::OnStartEditing( wxDataViewEvent &event ) void MyFrame::OnEditingStarted( wxDataViewEvent &event ) { - if (!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, Item: %s", title ); } void MyFrame::OnEditingDone( wxDataViewEvent &event ) { - if (!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, Item: %s", title ); } void MyFrame::OnExpanded( wxDataViewEvent &event ) { - if (!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, Item: %s", title ); } void MyFrame::OnCollapsing( wxDataViewEvent &event ) { - if (!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, Item: %s", title ); } void MyFrame::OnCollapsed( wxDataViewEvent &event ) { - if (!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, Item: %s", title ); } void MyFrame::OnContextMenu( wxDataViewEvent &event ) { - if (!m_log) - return; - wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s", title ); @@ -995,14 +1052,23 @@ void MyFrame::OnContextMenu( wxDataViewEvent &event ) m_ctrl[0]->PopupMenu(&menu); } -void MyFrame::OnHeaderClick( wxDataViewEvent &event ) +void MyFrame::OnAttrHeaderClick( wxDataViewEvent &event ) { // we need to skip the event to let the default behaviour of sorting by // this column when it is clicked to take place event.Skip(); - if (!m_log) - return; + int pos = m_ctrl[1]->GetColumnPosition( event.GetDataViewColumn() ); + + wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos ); + wxLogMessage( "Column title: %s Column width: %d", event.GetDataViewColumn()->GetTitle(), event.GetDataViewColumn()->GetWidth() ); +} + +void MyFrame::OnHeaderClick( wxDataViewEvent &event ) +{ + // we need to skip the event to let the default behaviour of sorting by + // this column when it is clicked to take place + event.Skip(); int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() ); @@ -1012,9 +1078,6 @@ void MyFrame::OnHeaderClick( wxDataViewEvent &event ) void MyFrame::OnHeaderRightClick( wxDataViewEvent &event ) { - if(!m_log) - return; - int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d", pos ); @@ -1022,24 +1085,19 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event ) void MyFrame::OnSorted( wxDataViewEvent &event ) { - if(!m_log) - return; - int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() ); wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d", pos ); } -void MyFrame::OnRightClick( wxMouseEvent &event ) +void MyFrame::OnDataViewChar(wxKeyEvent& event) { - if(!m_log) - return; - - wxLogMessage( "wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d", - event.GetX(), event.GetY() ); + if ( event.GetKeyCode() == WXK_DELETE ) + DeleteSelectedItems(); + else + event.Skip(); } - // ---------------------------------------------------------------------------- // MyFrame - event handlers for the second page // ---------------------------------------------------------------------------- @@ -1068,6 +1126,16 @@ void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event)) m_list_model->AddMany(); } +void MyFrame::OnHideAttributes(wxCommandEvent& WXUNUSED(event)) +{ + m_attributes->SetHidden(true); +} + +void MyFrame::OnShowAttributes(wxCommandEvent& WXUNUSED(event)) +{ + m_attributes->SetHidden(false); +} + // ---------------------------------------------------------------------------- // MyFrame - event handlers for the fourth page // ---------------------------------------------------------------------------- @@ -1078,7 +1146,7 @@ void MyFrame::OnDeleteTreeItem(wxCommandEvent& WXUNUSED(event)) wxDataViewItem selected = ctrl->GetSelection(); if (!selected.IsOk()) return; - + ctrl->DeleteItem(selected); } @@ -1092,13 +1160,18 @@ void MyFrame::OnAddTreeItem(wxCommandEvent& WXUNUSED(event)) { wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; wxDataViewItem selected = ctrl->GetSelection(); - ctrl->AppendItem( selected, "Item", 0 ); + if (ctrl->IsContainer(selected)) { + wxDataViewItem newitem = ctrl->AppendItem( selected, "Item", 0 ); + ctrl->Select(newitem); + ctrl->StartEditor(newitem, 0); + } } void MyFrame::OnAddTreeContainerItem(wxCommandEvent& WXUNUSED(event)) { wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; wxDataViewItem selected = ctrl->GetSelection(); - ctrl->AppendContainer(selected, "Container", 0 ); + if (ctrl->IsContainer(selected)) + ctrl->AppendContainer(selected, "Container", 0 ); }