X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a0951be51020cbe98ae9bebc58fe89acf4da6c6..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/generic/dirdlgg.cpp diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index dd9903c5a9..9adf9232db 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dirdlgg.h" #endif @@ -36,7 +36,7 @@ #endif #include "wx/statline.h" -#include "wx/generic/dirctrlg.h" +#include "wx/dirctrl.h" #include "wx/generic/dirdlgg.h" #include "wx/artprov.h" #include "wx/bmpbuttn.h" @@ -45,6 +45,8 @@ // wxGenericDirDialog //----------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog) + static const int ID_DIRCTRL = 1000; static const int ID_TEXTCTRL = 1001; static const int ID_OK = 1002; @@ -57,6 +59,7 @@ BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog) EVT_CLOSE (wxGenericDirDialog::OnCloseWindow) EVT_BUTTON (wxID_OK, wxGenericDirDialog::OnOK) EVT_BUTTON (ID_NEW, wxGenericDirDialog::OnNew) + EVT_BUTTON (ID_GO_HOME, wxGenericDirDialog::OnGoHome) EVT_TREE_KEY_DOWN (-1, wxGenericDirDialog::OnTreeKeyDown) EVT_TREE_SEL_CHANGED (-1, wxGenericDirDialog::OnTreeSelected) EVT_TEXT_ENTER (ID_TEXTCTRL, wxGenericDirDialog::OnOK) @@ -82,21 +85,29 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, // 0) 'New' and 'Home' Buttons wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL ); + // VS: 'Home directory' concept is unknown to MS-DOS +#ifndef __DOS__ wxBitmapButton* homeButton = new wxBitmapButton(this, ID_GO_HOME, wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG)); buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 ); +#endif // I'm not convinced we need a New button, and we tend to get annoying // accidental-editing with label editing enabled. - wxBitmapButton* newButton = - new wxBitmapButton(this, ID_NEW, - wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG)); - buttonsizer->Add( newButton, 0, wxRIGHT, 10 ); + if (style & wxDD_NEW_DIR_BUTTON) + { + wxBitmapButton* newButton = + new wxBitmapButton(this, ID_NEW, + wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG)); + buttonsizer->Add( newButton, 0, wxRIGHT, 10 ); +#if wxUSE_TOOLTIPS + newButton->SetToolTip(_("Create new directory")); +#endif + } #if wxUSE_TOOLTIPS homeButton->SetToolTip(_("Go to home directory")); - newButton->SetToolTip(_("Create new directory")); #endif topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 ); @@ -104,10 +115,21 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, // 1) dir ctrl m_dirCtrl = NULL; // this is neccessary, event handler called from // wxGenericDirCtrl would crash otherwise! + long dirStyle = wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER; + +#ifdef __WXMSW__ + if (style & wxDD_NEW_DIR_BUTTON) + { + // Only under Windows do we need the wxTR_EDIT_LABEL tree control style + // before we can call EditLabel (required for "New directory") + dirStyle |= wxDIRCTRL_EDIT_LABELS; + } +#endif + m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL, m_path, wxPoint(5, 5), wxSize(300, 200), - wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER); + dirStyle); topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 ); @@ -230,14 +252,14 @@ void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event ) if (!m_dirCtrl) return; - m_dirCtrl->ShowHidden( event.GetInt() ); + m_dirCtrl->ShowHidden( event.GetInt() != 0 ); } void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) { wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection(); if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) || - (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem())) + (m_dirCtrl->GetTreeCtrl()->GetItemParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem())) { wxMessageDialog msg(this, _("You cannot add a new directory to this section."), _("Create directory"), wxOK | wxICON_INFORMATION ); @@ -245,13 +267,13 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) return; } - wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id ); + wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetItemParent( id ); wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent ); wxASSERT( data ); wxString new_name( _("NewName") ); wxString path( data->m_path ); - if (path.Last() != wxFILE_SEP_PATH) + if (!wxEndsWithPathSeparator(path)) path += wxFILE_SEP_PATH; path += new_name; if (wxFileExists(path)) @@ -265,7 +287,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) new_name += num; path = data->m_path; - if (path.Last() != wxFILE_SEP_PATH) + if (!wxEndsWithPathSeparator(path)) path += wxFILE_SEP_PATH; path += new_name; i++; @@ -289,4 +311,9 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) m_dirCtrl->GetTreeCtrl()->EditLabel( new_id ); } +void wxGenericDirDialog::OnGoHome(wxCommandEvent& WXUNUSED(event)) +{ + SetPath(wxGetUserHome()); +} + #endif // wxUSE_DIRDLG