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

merged fix from the 2.2 branch but the test I changed seems to have disappeared - is it ok?

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-03-06 20:09:48 +00:00
parent 39189b9dc7
commit eb08590746
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/dirdlgg.cpp
View File

@@ -320,9 +320,9 @@ void wxDirCtrl::OnExpandItem(wxTreeEvent &event)
m_paths.Clear(); m_paths.Clear();
m_names.Clear(); m_names.Clear();
#ifdef __WXMSW__ #ifdef __WXMSW__
search = data->m_path + "\\*.*"; search = data->m_path + _T("\\*.*");
#else #else
search = data->m_path + "/*"; search = data->m_path + _T("/*");
#endif #endif
for (path = wxFindFirstFile( search, wxDIR ); !path.IsNull(); for (path = wxFindFirstFile( search, wxDIR ); !path.IsNull();
path=wxFindNextFile() ) path=wxFindNextFile() )
@@ -331,7 +331,7 @@ void wxDirCtrl::OnExpandItem(wxTreeEvent &event)
/* Don't add "." and ".." to the tree. I think wxFindNextFile /* Don't add "." and ".." to the tree. I think wxFindNextFile
* also checks this, but I don't quite understand what happens * also checks this, but I don't quite understand what happens
* there. Also wxFindNextFile seems to swallow hidden dirs */ * there. Also wxFindNextFile seems to swallow hidden dirs */
if ((filename != ".") && (filename != "..")) if ( (filename != _T(".")) && (filename != _T("..")) )
{ {
m_paths.Add(path); m_paths.Add(path);
m_names.Add(filename); m_names.Add(filename);
@@ -397,7 +397,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
// 1) dir ctrl // 1) dir ctrl
m_dir = new wxDirCtrl( this, ID_DIRCTRL, "/", m_dir = new wxDirCtrl( this, ID_DIRCTRL, _T("/"),
wxDefaultPosition, wxDefaultPosition,
wxSize(200,200), wxSize(200,200),
wxTR_HAS_BUTTONS | wxTR_HAS_BUTTONS |