From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Mar 2001 20:09:48 +0000 (+0000)
Subject: merged fix from the 2.2 branch but the test I changed seems to have disappeared ... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eb085907468d3c3a9912d453647c1ab14b951a7c?ds=inline

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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