1. some more tests in console

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 0e311a3aac88194b226081f24de8b122d5554d5a..5ea3910aee93b0dec8ccd7fd63486ee889307ac7 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -48,11 +48,15 @@
 
 #ifdef __WXMSW__
 #include <windows.h>
+
+#ifndef __GNUWIN32__
 #include <direct.h>
 #include <stdlib.h>
 #include <ctype.h>
 #endif
 
+#endif
+
 #ifdef __BORLANDC__
 #include "dos.h"
 #endif
@@ -293,7 +297,7 @@ static const int ID_CANCEL = 1003;
 static const int ID_NEW = 1004;
 //static const int ID_CHECK = 1005;
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
 static bool wxIsDriveAvailable(const wxString dirName)
 {
 #ifdef __WIN32__
@@ -306,6 +310,9 @@ static bool wxIsDriveAvailable(const wxString dirName)
     if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
     {
         wxString dirNameLower(dirName.Lower());
+#if defined(__GNUWIN32__)
+        success = wxPathExists(dirNameLower);
+#else
         int currentDrive = _getdrive();
         int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
         int err = _chdrive( thisDrive ) ;
@@ -315,6 +322,7 @@ static bool wxIsDriveAvailable(const wxString dirName)
         {
             success = FALSE;
         }
+#endif
     }
 #ifdef __WIN32__
     (void) SetErrorMode(errorMode);
@@ -354,32 +362,6 @@ void wxDirItemDataEx::SetNewDirName( wxString path )
     m_name = wxFileNameFromPath( path );
 }
 
-// No longer used, and takes a very long time
-bool wxDirItemDataEx::HasSubDirs()
-{
-    if (m_path.IsEmpty())
-        return TRUE;
-
-    // On WIN32, must check if this volume is mounted or
-    // we get an error dialog for e.g. drive a:
-#ifdef __WIN32__
-    if (!wxIsDriveAvailable(m_path))
-        return FALSE;
-#endif
-
-    wxString search = m_path;
-    
-    if (m_path.Last() != wxFILE_SEP_PATH)
-    {
-        search += wxString(wxFILE_SEP_PATH);
-    }
-    search += wxT("*");
-
-    wxLogNull log;
-    wxString path = wxFindFirstFile( search, wxDIR );
-    return (bool)(!path.IsNull());
-}
-
 //-----------------------------------------------------------------------------
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
@@ -416,7 +398,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     Init();
 
-    long treeStyle = wxTR_HAS_BUTTONS;
+    long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS;
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 
@@ -710,8 +692,8 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     if (!wxIsDriveAvailable(dirName))
     {
         data->m_isExpanded = FALSE;
-        wxMessageBox(wxT("Sorry, this drive is not available."));
-          return;
+        //wxMessageBox(wxT("Sorry, this drive is not available."));
+        return;
     }
 #endif
 
@@ -1181,6 +1163,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
 
 BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
     EVT_BUTTON(wxID_OK,  wxGenericDirDialog::OnOK)
+    EVT_BUTTON(wxID_NEW,  wxGenericDirDialog::OnNew)
     EVT_BUTTON               (wxID_NEW,     wxGenericDirDialog::OnNew)
     EVT_CLOSE(wxGenericDirDialog::OnCloseWindow)
     EVT_TREE_KEY_DOWN        (-1,   wxGenericDirDialog::OnTreeKeyDown)
@@ -1222,10 +1205,13 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel"));
     buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
 
-/* TODO: new directory button
-    wxButton* newButton = new wxButton( this, ID_NEW, _("New...") );
+    // I'm not convinced we need a New button, and we tend to get annoying
+    // accidental-editing with label editing enabled.
+#if 0
+    wxButton* newButton = new wxButton( this, wxID_NEW, _("New...") );
     buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 );
-*/
+#endif
+
     topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 );
 
     okButton->SetDefault();
@@ -1318,10 +1304,9 @@ void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
 
 void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
 {
-#if 0
-    wxTreeItemId id = m_dir->GetSelection();
-    if ((id == m_dir->GetRootItem()) ||
-        (m_dir->GetParent(id) == m_dir->GetRootItem()))
+    wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
+    if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) ||
+        (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem()))
     {
         wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
                             _("Create directory"), wxOK | wxICON_INFORMATION );
@@ -1329,13 +1314,14 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
         return;
     }
 
-    wxTreeItemId parent = m_dir->GetParent( id );
-    wxDirItemData *data = (wxDirItemData*)m_dir->GetItemData( parent );
+    wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id );
+    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent );
     wxASSERT( data );
 
     wxString new_name( wxT("NewName") );
     wxString path( data->m_path );
-    path += wxT("/");
+    if (path.Last() != wxFILE_SEP_PATH)
+        path += wxFILE_SEP_PATH;
     path += new_name;
     if (wxFileExists(path))
     {
@@ -1348,7 +1334,8 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
             new_name += num;
 
             path = data->m_path;
-            path += wxT("/");
+            if (path.Last() != wxFILE_SEP_PATH)
+                path += wxFILE_SEP_PATH;
             path += new_name;
             i++;
         } while (wxFileExists(path));
@@ -1362,9 +1349,11 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
         return;
     }
 
-    wxDirItemData *new_data = new wxDirItemData( path, new_name );
-    wxTreeItemId new_id = m_dir->AppendItem( parent, new_name, 0, 1, new_data );
-    m_dir->EnsureVisible( new_id );
-    m_dir->EditLabel( new_id );
-#endif
+    wxDirItemDataEx *new_data = new wxDirItemDataEx( path, new_name, TRUE );
+
+    // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child
+    // of the parent.
+    wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data );
+    m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id );
+    m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
 }