X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b5e5f48053ab30f80367a2f5b32834260080ab6..14d776932c74f52c5fcc12f9dc2814f177a9f329:/src/generic/filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 0d3d25fd0f..fc92b7327a 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Name:        filedlgg.cpp
+// Name:        src/generic/filedlgg.cpp
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filedlgg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -34,6 +30,7 @@
 #include "wx/stattext.h"
 #include "wx/debug.h"
 #include "wx/log.h"
+#include "wx/longlong.h"
 #include "wx/intl.h"
 #include "wx/msgdlg.h"
 #include "wx/sizer.h"
@@ -83,64 +80,89 @@
 // ----------------------------------------------------------------------------
 
 static
-int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder)
 {
-     wxFileData *fd1 = (wxFileData*)data1;
-     wxFileData *fd2 = (wxFileData*)data2;
-     if (fd1->GetFileName() == wxT("..")) return -data;
-     if (fd2->GetFileName() == wxT("..")) return data;
-     if (fd1->IsDir() && !fd2->IsDir()) return -data;
-     if (fd2->IsDir() && !fd1->IsDir()) return data;
-     return data*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() );
+     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+     if (fd1->GetFileName() == wxT(".."))
+         return -sortOrder;
+     if (fd2->GetFileName() == wxT(".."))
+         return sortOrder;
+     if (fd1->IsDir() && !fd2->IsDir())
+         return -sortOrder;
+     if (fd2->IsDir() && !fd1->IsDir())
+         return sortOrder;
+
+     return sortOrder*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() );
 }
 
 static
-int wxCALLBACK wxFileDataSizeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder)
 {
-     wxFileData *fd1 = (wxFileData*)data1;
-     wxFileData *fd2 = (wxFileData*)data2;
-     if (fd1->GetFileName() == wxT("..")) return -data;
-     if (fd2->GetFileName() == wxT("..")) return data;
-     if (fd1->IsDir() && !fd2->IsDir()) return -data;
-     if (fd2->IsDir() && !fd1->IsDir()) return data;
-     if (fd1->IsLink() && !fd2->IsLink()) return -data;
-     if (fd2->IsLink() && !fd1->IsLink()) return data;
-     return data*(fd1->GetSize() - fd2->GetSize());
+     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+     if (fd1->GetFileName() == wxT(".."))
+         return -sortOrder;
+     if (fd2->GetFileName() == wxT(".."))
+         return sortOrder;
+     if (fd1->IsDir() && !fd2->IsDir())
+         return -sortOrder;
+     if (fd2->IsDir() && !fd1->IsDir())
+         return sortOrder;
+     if (fd1->IsLink() && !fd2->IsLink())
+         return -sortOrder;
+     if (fd2->IsLink() && !fd1->IsLink())
+         return sortOrder;
+
+     return fd1->GetSize() > fd2->GetSize() ? sortOrder : -sortOrder;
 }
 
 static
-int wxCALLBACK wxFileDataTypeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder)
 {
-     wxFileData *fd1 = (wxFileData*)data1;
-     wxFileData *fd2 = (wxFileData*)data2;
-     if (fd1->GetFileName() == wxT("..")) return -data;
-     if (fd2->GetFileName() == wxT("..")) return data;
-     if (fd1->IsDir() && !fd2->IsDir()) return -data;
-     if (fd2->IsDir() && !fd1->IsDir()) return data;
-     if (fd1->IsLink() && !fd2->IsLink()) return -data;
-     if (fd2->IsLink() && !fd1->IsLink()) return data;
-     return data*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );
+     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+     if (fd1->GetFileName() == wxT(".."))
+         return -sortOrder;
+     if (fd2->GetFileName() == wxT(".."))
+         return sortOrder;
+     if (fd1->IsDir() && !fd2->IsDir())
+         return -sortOrder;
+     if (fd2->IsDir() && !fd1->IsDir())
+         return sortOrder;
+     if (fd1->IsLink() && !fd2->IsLink())
+         return -sortOrder;
+     if (fd2->IsLink() && !fd1->IsLink())
+         return sortOrder;
+
+     return sortOrder*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );
 }
 
 static
-int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, long sortOrder)
 {
-     wxFileData *fd1 = (wxFileData*)data1;
-     wxFileData *fd2 = (wxFileData*)data2;
-     if (fd1->GetFileName() == wxT("..")) return -data;
-     if (fd2->GetFileName() == wxT("..")) return data;
-     if (fd1->IsDir() && !fd2->IsDir()) return -data;
-     if (fd2->IsDir() && !fd1->IsDir()) return data;
-
-     return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
+     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+     if (fd1->GetFileName() == wxT(".."))
+         return -sortOrder;
+     if (fd2->GetFileName() == wxT(".."))
+         return sortOrder;
+     if (fd1->IsDir() && !fd2->IsDir())
+         return -sortOrder;
+     if (fd2->IsDir() && !fd1->IsDir())
+         return sortOrder;
+
+     return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? sortOrder : -sortOrder;
 }
 
-#if defined(__UNIX__) && !defined(__OS2__)
-#define IsTopMostDir(dir)   (dir == wxT("/"))
-#endif
-
 #if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
 #define IsTopMostDir(dir)   (dir.empty())
+#else
+#define IsTopMostDir(dir)   (dir == wxT("/"))
 #endif
 
 // defined in src/generic/dirctrlg.cpp
@@ -227,7 +249,7 @@ void wxFileData::ReadData()
         }
     }
 
-    m_size = (long)buff.st_size;
+    m_size = buff.st_size;
 
     m_dateTime = buff.st_mtime;
 
@@ -263,7 +285,7 @@ wxString wxFileData::GetFileType() const
         return _("<LINK>");
     else if (IsDrive())
         return _("<DRIVE>");
-   else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
+    else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
         return m_fileName.AfterLast(wxT('.'));
 
     return wxEmptyString;
@@ -287,7 +309,8 @@ wxString wxFileData::GetHint() const
     else if (IsDrive())
         s += _("<DRIVE>");
     else // plain file
-        s += wxString::Format( _("%ld bytes"), m_size );
+        s += wxString::Format(_("%ld bytes"),
+                              wxLongLong(m_size).ToString().c_str());
 
     s += wxT(' ');
 
@@ -299,7 +322,7 @@ wxString wxFileData::GetHint() const
     }
 
     return s;
-};
+}
 
 wxString wxFileData::GetEntry( fileListFieldType num ) const
 {
@@ -312,7 +335,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const
 
         case FileList_Size:
             if (!IsDir() && !IsLink() && !IsDrive())
-                s.Printf(_T("%ld"), m_size);
+                s = wxLongLong(m_size).ToString();
             break;
 
         case FileList_Type:
@@ -320,7 +343,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const
             break;
 
         case FileList_Time:
-                if (!IsDrive())
+            if (!IsDrive())
                 s = GetModificationTime();
             break;
 
@@ -360,7 +383,7 @@ void wxFileData::MakeItem( wxListItem &item )
         if ( dg.Ok() )
             item.SetTextColour(dg);
     }
-    item.m_data = (long)this;
+    item.m_data = wxPtrToUInt(this);
 }
 
 //-----------------------------------------------------------------------------
@@ -536,7 +559,7 @@ void wxFileCtrl::UpdateFiles()
 #endif // __UNIX__
             wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
             if (Add(fd, item) != -1)
-            item.m_itemId++;
+                item.m_itemId++;
             else
                 delete fd;
         }
@@ -565,7 +588,7 @@ void wxFileCtrl::UpdateFiles()
             {
                 wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
                 if (Add(fd, item) != -1)
-                item.m_itemId++;
+                    item.m_itemId++;
                 else
                     delete fd;
 
@@ -583,7 +606,7 @@ void wxFileCtrl::UpdateFiles()
                 {
                     wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
                     if (Add(fd, item) != -1)
-                    item.m_itemId++;
+                        item.m_itemId++;
                     else
                         delete fd;
 
@@ -645,7 +668,7 @@ void wxFileCtrl::MakeDir()
     if (id != -1)
     {
         SortItems(m_sort_field, m_sort_foward);
-        id = FindItem( 0, (long)fd );
+        id = FindItem( 0, wxPtrToUInt(fd) );
         EnsureVisible( id );
         EditLabel( id );
     }
@@ -798,35 +821,30 @@ void wxFileCtrl::OnListColClick( wxListEvent &event )
     SortItems(m_sort_field, m_sort_foward);
 }
 
-void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward)
+void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool forward)
 {
     m_sort_field = field;
-    m_sort_foward = foward;
-    long sort_dir = foward ? 1 : -1;
+    m_sort_foward = forward;
+    const long sort_dir = forward ? 1 : -1;
 
     switch (m_sort_field)
     {
-        case wxFileData::FileList_Name :
-        {
-            wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataNameCompare, sort_dir);
-            break;
-        }
         case wxFileData::FileList_Size :
-        {
-             wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataSizeCompare, sort_dir);
+            wxListCtrl::SortItems(wxFileDataSizeCompare, sort_dir);
             break;
-        }
+
         case wxFileData::FileList_Type :
-        {
-             wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTypeCompare, sort_dir);
-             break;
-        }
+            wxListCtrl::SortItems(wxFileDataTypeCompare, sort_dir);
+            break;
+
         case wxFileData::FileList_Time :
-        {
-             wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTimeCompare, sort_dir);
-             break;
-        }
-        default : break;
+            wxListCtrl::SortItems(wxFileDataTimeCompare, sort_dir);
+            break;
+
+        case wxFileData::FileList_Name :
+        default :
+            wxListCtrl::SortItems(wxFileDataNameCompare, sort_dir);
+            break;
     }
 }
 
@@ -1468,9 +1486,8 @@ void wxGenericFileDialog::UpdateControls()
 
 #ifdef USE_GENERIC_FILEDIALOG
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
 
 #endif // USE_GENERIC_FILEDIALOG
 
 #endif // wxUSE_FILEDLG
-