Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wxGenericFileDialog::Get{Path,Directory,Filename}() functions which were completely broken by wxFileCtrl patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-05 23:54:40 +00:00
parent 2826ef0c63
commit 398eebb155
4 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/generic/filedlgg.cpp
View File

@@ -198,9 +198,6 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
m_dir.Remove( len-1, 1 );
m_path = m_dir;
m_path += wxFILE_SEP_PATH;
m_path += defaultFile;
m_filterExtension = wxEmptyString;
// layout
@@ -350,16 +347,6 @@ bool wxGenericFileDialog::Show( bool show )
return wxDialog::Show( show );
}
void wxGenericFileDialog::SetWildcard(const wxString& wildCard)
{
m_filectrl->SetWildcard(wildCard);
}
void wxGenericFileDialog::SetFilterIndex( int filterindex )
{
m_filectrl->SetFilterIndex(filterindex);
}
void wxGenericFileDialog::OnOk( wxCommandEvent &WXUNUSED(event) )
{
wxArrayString selectedFiles;
@@ -413,30 +400,12 @@ void wxGenericFileDialog::OnFileActivated( wxFileCtrlEvent &WXUNUSED(event) )
OnOk( dummy );
}
void wxGenericFileDialog::SetPath( const wxString& path )
{
// not only set the full path but also update filename and dir
m_path = path;
m_filectrl->SetPath(path);
}
void wxGenericFileDialog::GetPaths( wxArrayString& paths ) const
{
m_filectrl->GetPaths(paths);
}
void wxGenericFileDialog::GetFilenames(wxArrayString& files) const
{
m_filectrl->GetFilenames(files);
}
void wxGenericFileDialog::OnUpdateButtonsUI(wxUpdateUIEvent& event)
{
// surprisingly, we can be called before m_filectrl is set in Create() as
// wxFileCtrl ctor itself can generate idle events, so we need this test
if ( m_filectrl )
event.Enable( !IsTopMostDir(m_filectrl->GetDirectory()) );
event.Enable( !IsTopMostDir(m_filectrl->GetShownDirectory()) );
}
#ifdef wxHAS_GENERIC_FILEDIALOG