微修正。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@86 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/frontend/cls_listctrl.cpp b/src/frontend/cls_listctrl.cpp
index 89d8401..e998b74 100644 (file)
--- a/src/frontend/cls_listctrl.cpp
+++ b/src/frontend/cls_listctrl.cpp
@@ -121,7 +121,7 @@ void myListCtrl::OnColClick(wxListEvent& e)
 int ListCtrlCompareProc(TPI_FILEINFO ** pItem1, TPI_FILEINFO ** pItem2)\r
 {\r
        TPI_FILEINFO * item1 = * pItem1, * item2 = * pItem2;\r
-       int nResult =\r
+       return (g_fSortAscend ? 1 : -1) * (\r
                g_nSortColumn == 0 ? ::wxStricmp(item1->fnFileName.GetFullName(), item2->fnFileName.GetFullName()) : // Filename\r
                g_nSortColumn == 1 ? NumCmp(llUnpackedSize) : // Unpacked\r
                g_nSortColumn == 2 ? NumCmp(llPackedSize) : // Packed\r
@@ -130,6 +130,5 @@ int ListCtrlCompareProc(TPI_FILEINFO ** pItem1, TPI_FILEINFO ** pItem2)
                g_nSortColumn == 7 ? ::wxStricmp(item1->fnFileName.GetPath(), item2->fnFileName.GetPath()) : // Path\r
                g_nSortColumn == 8 ? ::wxStricmp(GetFileTypeName(item1->fnFileName), GetFileTypeName(item2->fnFileName)) : // Type\r
                g_nSortColumn == 9 ? NumCmp(llFileID) : // No\r
-               0;\r
-       return g_fSortAscend ? nResult : nResult * -1;\r
+               0);\r
 }\r