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

More fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2000-10-04 15:16:20 +00:00
parent 4f43043985
commit 3438012b66
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/generic/dirctrlg.cpp
View File

@ -416,7 +416,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
Init(); Init();
long treeStyle = wxTR_HAS_BUTTONS; long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS;
if ((style & wxDIRCTRL_3D_INTERNAL) == 0) if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
treeStyle |= wxNO_BORDER; treeStyle |= wxNO_BORDER;
@ -1181,6 +1181,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
EVT_BUTTON(wxID_OK, wxGenericDirDialog::OnOK) EVT_BUTTON(wxID_OK, wxGenericDirDialog::OnOK)
EVT_BUTTON(wxID_NEW, wxGenericDirDialog::OnNew)
EVT_BUTTON (wxID_NEW, wxGenericDirDialog::OnNew) EVT_BUTTON (wxID_NEW, wxGenericDirDialog::OnNew)
EVT_CLOSE(wxGenericDirDialog::OnCloseWindow) EVT_CLOSE(wxGenericDirDialog::OnCloseWindow)
EVT_TREE_KEY_DOWN (-1, wxGenericDirDialog::OnTreeKeyDown) EVT_TREE_KEY_DOWN (-1, wxGenericDirDialog::OnTreeKeyDown)
@ -1222,10 +1223,13 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel")); wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel"));
buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 ); buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
/* TODO: new directory button // I'm not convinced we need a New button, and we tend to get annoying
wxButton* newButton = new wxButton( this, ID_NEW, _("New...") ); // accidental-editing with label editing enabled.
#if 0
wxButton* newButton = new wxButton( this, wxID_NEW, _("New...") );
buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 ); buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 );
*/ #endif
topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 ); topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 );
okButton->SetDefault(); okButton->SetDefault();
@ -1318,10 +1322,9 @@ void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
{ {
#if 0 wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
wxTreeItemId id = m_dir->GetSelection(); if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) ||
if ((id == m_dir->GetRootItem()) || (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem()))
(m_dir->GetParent(id) == m_dir->GetRootItem()))
{ {
wxMessageDialog msg(this, _("You cannot add a new directory to this section."), wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
_("Create directory"), wxOK | wxICON_INFORMATION ); _("Create directory"), wxOK | wxICON_INFORMATION );
@ -1329,13 +1332,14 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
return; return;
} }
wxTreeItemId parent = m_dir->GetParent( id ); wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id );
wxDirItemData *data = (wxDirItemData*)m_dir->GetItemData( parent ); wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent );
wxASSERT( data ); wxASSERT( data );
wxString new_name( wxT("NewName") ); wxString new_name( wxT("NewName") );
wxString path( data->m_path ); wxString path( data->m_path );
path += wxT("/"); if (path.Last() != wxFILE_SEP_PATH)
path += wxFILE_SEP_PATH;
path += new_name; path += new_name;
if (wxFileExists(path)) if (wxFileExists(path))
{ {
@ -1348,7 +1352,8 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
new_name += num; new_name += num;
path = data->m_path; path = data->m_path;
path += wxT("/"); if (path.Last() != wxFILE_SEP_PATH)
path += wxFILE_SEP_PATH;
path += new_name; path += new_name;
i++; i++;
} while (wxFileExists(path)); } while (wxFileExists(path));
@ -1362,9 +1367,11 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
return; return;
} }
wxDirItemData *new_data = new wxDirItemData( path, new_name ); wxDirItemDataEx *new_data = new wxDirItemDataEx( path, new_name, TRUE );
wxTreeItemId new_id = m_dir->AppendItem( parent, new_name, 0, 1, new_data );
m_dir->EnsureVisible( new_id ); // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child
m_dir->EditLabel( new_id ); // of the parent.
#endif wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data );
m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id );
m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
} }