new redrawing code

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 9ecc12930dae6dc9029918d977a975f2d2f38a95..edc98c38be3958cd13df138d21cc35662b69eb5a 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -759,6 +759,9 @@ void wxFileCtrl::GoToParentDir()
 {
     if (m_dirName != wxT("/"))
     {
+        size_t len = m_dirName.Len();
+        if (m_dirName[len-1] == wxT('/'))
+            m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
         if (m_dirName.IsEmpty()) m_dirName = wxT("/");
@@ -919,12 +922,17 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
         m_dialogStyle |= wxOPEN;
 
     m_dir = defaultDir;
-    if ((m_dir.IsEmpty()) || (m_dir == wxT(".")))
+    if ((m_dir.empty()) || (m_dir == wxT(".")))
     {
         char buf[200];
         m_dir = getcwd( buf, sizeof(buf) );
     }
-    m_path = defaultDir;
+    
+    size_t len = m_dir.Len();
+    if ((len > 1) && (m_dir[len-1] == wxT('/')))
+        m_dir.Remove( len-1, 1 );
+
+    m_path = m_dir;
     m_path += wxT("/");
     m_path += defaultFile;
     m_fileName = defaultFile;