vc6 did not like this (void function returning a value)

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

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index cfecb2217de3e250aafe3fa06a53412fb4e5dfa4..5427143e0121267ac1d39c42580bdc405979a05c 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -224,7 +224,7 @@ void wxFileData::ReadData()
 
 #if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
     lstat( m_filePath.fn_str(), &buff );
-    m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
+    m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
 #else // no lstat()
     // only translate to file charset if we don't go by our
     // wxStat implementation
@@ -393,8 +393,6 @@ void wxFileData::MakeItem( wxListItem &item )
 //  wxFileListCtrl
 //-----------------------------------------------------------------------------
 
-static bool ignoreChanges = false;
-
 IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl)
 
 BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)
@@ -408,7 +406,7 @@ END_EVENT_TABLE()
 wxFileListCtrl::wxFileListCtrl()
 {
     m_showHidden = false;
-    m_sort_foward = 1;
+    m_sort_forward = true;
     m_sort_field = wxFileData::FileList_Name;
 }
 
@@ -430,7 +428,7 @@ wxFileListCtrl::wxFileListCtrl(wxWindow *win,
 
     m_showHidden = showHidden;
 
-    m_sort_foward = 1;
+    m_sort_forward = true;
     m_sort_field = wxFileData::FileList_Name;
 
     m_dirName = wxT("*");
@@ -541,11 +539,23 @@ void wxFileListCtrl::UpdateFiles()
     {
         wxArrayString names, paths;
         wxArrayInt icons;
-        size_t n, count = wxGetAvailableDrives(paths, names, icons);
+        const size_t count = wxGetAvailableDrives(paths, names, icons);
 
-        for (n=0; n<count; n++)
+        for ( size_t n = 0; n < count; n++ )
         {
-            wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
+            // use paths[n] as the drive name too as our HandleAction() can't
+            // deal with the drive names (of the form "System (C:)") currently
+            // as it mistakenly treats them as file names
+            //
+            // it would be preferable to show names, and not paths, in the
+            // dialog just as the native dialog does but for this we must:
+            //  a) store the item type as item data and modify HandleAction()
+            //     to use it instead of wxDirExists() to check whether the item
+            //     is a directory
+            //  b) store the drives by their drive letters and not their
+            //     descriptions as otherwise it's pretty confusing to the user
+            wxFileData *fd = new wxFileData(paths[n], paths[n],
+                                            wxFileData::is_drive, icons[n]);
             if (Add(fd, item) != -1)
                 item.m_itemId++;
             else
@@ -626,7 +636,7 @@ void wxFileListCtrl::UpdateFiles()
         }
     }
 
-    SortItems(m_sort_field, m_sort_foward);
+    SortItems(m_sort_field, m_sort_forward);
 }
 
 void wxFileListCtrl::SetWild( const wxString &wild )
@@ -677,7 +687,7 @@ void wxFileListCtrl::MakeDir()
 
     if (id != -1)
     {
-        SortItems(m_sort_field, m_sort_foward);
+        SortItems(m_sort_field, m_sort_forward);
         id = FindItem( 0, wxPtrToUInt(fd) );
         EnsureVisible( id );
         EditLabel( id );
@@ -709,10 +719,8 @@ void wxFileListCtrl::GoToParentDir()
         long id = FindItem( 0, fname );
         if (id != wxNOT_FOUND)
         {
-            ignoreChanges = true;
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
-            ignoreChanges = false;
         }
     }
 }
@@ -730,9 +738,7 @@ void wxFileListCtrl::GoToDir( const wxString &dir )
     m_dirName = dir;
     UpdateFiles();
 
-    ignoreChanges = true;
     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-    ignoreChanges = false;
 
     EnsureVisible( 0 );
 }
@@ -805,9 +811,7 @@ void wxFileListCtrl::OnListEndLabelEdit( wxListEvent &event )
     {
         fd->SetNewName( new_name, event.GetLabel() );
 
-        ignoreChanges = true;
         SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-        ignoreChanges = false;
 
         UpdateItem( event.GetItem() );
         EnsureVisible( event.GetItem() );
@@ -834,17 +838,17 @@ void wxFileListCtrl::OnListColClick( wxListEvent &event )
     }
 
     if ((wxFileData::fileListFieldType)col == m_sort_field)
-        m_sort_foward = !m_sort_foward;
+        m_sort_forward = !m_sort_forward;
     else
         m_sort_field = (wxFileData::fileListFieldType)col;
 
-    SortItems(m_sort_field, m_sort_foward);
+    SortItems(m_sort_field, m_sort_forward);
 }
 
 void wxFileListCtrl::SortItems(wxFileData::fileListFieldType field, bool forward)
 {
     m_sort_field = field;
-    m_sort_foward = forward;
+    m_sort_forward = forward;
     const long sort_dir = forward ? 1 : -1;
 
     switch (m_sort_field)