Added style parameter to wxPopupWindow ctors so they match the Create method.

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index d993b94ae7553ed5b5d02225c87af108bbf1bf36..454b60cc0511013a9595f7ba55246f94aaa5fb2a 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -29,6 +29,7 @@
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"

+#include "wx/textctrl.h"

 #include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/cmndata.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/cmndata.h"


@@ -311,18 +312,21 @@ void wxDirCtrl::OnExpandItem(wxTreeEvent &event)
     wxBeginBusyCursor();
 
     wxDirItemData *data = (wxDirItemData *)GetItemData(event.GetItem());
     wxBeginBusyCursor();
 
     wxDirItemData *data = (wxDirItemData *)GetItemData(event.GetItem());

-    wxASSERT(data);

 
     m_paths.Clear();
     m_names.Clear();
 
 
     m_paths.Clear();
     m_names.Clear();
 

-    wxDir dir(data->m_path);
+    wxString path = data->m_path;
+
+    wxDir dir(path);
+
+    path += _T('/');

 
     wxString filename;
     bool cont = dir.GetFirst(&filename, "", wxDIR_DIRS | wxDIR_HIDDEN);
     while ( cont )
     {
 
     wxString filename;
     bool cont = dir.GetFirst(&filename, "", wxDIR_DIRS | wxDIR_HIDDEN);
     while ( cont )
     {

-        m_paths.Add(data->m_path);
+        m_paths.Add(path + filename);

         m_names.Add(filename);
 
         cont = dir.GetNext(&filename);
         m_names.Add(filename);
 
         cont = dir.GetNext(&filename);


@@ -442,7 +446,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
     long cookie = 0;
     // default to root dir
     wxTreeItemId item = m_dir->GetFirstChild(m_dir->GetRootItem(), cookie);
     long cookie = 0;
     // default to root dir
     wxTreeItemId item = m_dir->GetFirstChild(m_dir->GetRootItem(), cookie);

-    
+

     if (!m_path.IsEmpty() && (m_path != wxT("/")) && (m_dir->m_paths.Count() > 1))
     {
         size_t count = m_dir->m_paths.GetCount();
     if (!m_path.IsEmpty() && (m_path != wxT("/")) && (m_dir->m_paths.Count() > 1))
     {
         size_t count = m_dir->m_paths.GetCount();


@@ -451,14 +455,14 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
             if (m_path.Find( m_dir->m_paths[i] ) == 0)
             {
                 path = m_dir->m_paths[i];
             if (m_path.Find( m_dir->m_paths[i] ) == 0)
             {
                 path = m_dir->m_paths[i];

-                
+

                 for (size_t j = 0; j < i; j++)
                    item = m_dir->GetNextChild(m_dir->GetRootItem(), cookie);
                 for (size_t j = 0; j < i; j++)
                    item = m_dir->GetNextChild(m_dir->GetRootItem(), cookie);

-                
+

                 wxStringTokenizer tk2(path, wxFILE_SEP_PATH, wxTOKEN_STRTOK);
                 for (size_t h = 0; h < tk2.CountTokens(); h++)
                    tk.GetNextToken();
                 wxStringTokenizer tk2(path, wxFILE_SEP_PATH, wxTOKEN_STRTOK);
                 for (size_t h = 0; h < tk2.CountTokens(); h++)
                    tk.GetNextToken();

-                
+

                 break;
             }
         }
                 break;
             }
         }