asInputをfilesへのポインタに変更。

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

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 4969079..0fb4a6c 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -103,7 +103,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        this->lcFiles->SetSingleStyle(wxLC_VIRTUAL);\r
        this->lcFiles->InsertColumn(0, _("Input"),  wxLIST_FORMAT_LEFT,  150);\r
        this->lcFiles->InsertColumn(1, _("Output"), wxLIST_FORMAT_LEFT,  290);\r
-       this->lcFiles->asInput = this->files;\r
+       this->lcFiles->asInput = & this->files;\r
        this->lcFiles->atDangerItem.SetTextColour(* wxRED);\r
 \r
        ::wxXmlResource::Get()->Unload(L_DIR_S_XRC wxT("dlg_make.xrc"));\r
@@ -214,7 +214,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
                                        {\r
                                                do\r
                                                {\r
-                                                       if (fiInfo.eSupportedCommand & TPI_COMMAND_CREATE && (this->lcFiles->asInput.GetCount() == 1 || fiInfo.fArchive))\r
+                                                       if (fiInfo.eSupportedCommand & TPI_COMMAND_CREATE && (this->lcFiles->asInput->GetCount() == 1 || fiInfo.fArchive))\r
                                                        {\r
                                                                fiInfo.szTPIName = szLibName;\r
                                                                this->afInfo.Add(fiInfo);\r
@@ -245,7 +245,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        }\r
 \r
        // 展開/格納先を予測。ただしDTVスキャンに時間がかかる場合はスキップ可能。\r
-       if (this->lcFiles->asInput.GetCount() < 3000 || ::AskDlg(_("This archive contains so many files that it takes long to check Directory Traversal Vulnerability(DTV) problem. If you are sure this archive is safe, you can skip this scanning process. Do you want to scan for DTV problem?"), this) == wxYES)\r
+       if (this->lcFiles->asInput->GetCount() < 3000 || ::AskDlg(_("This archive contains so many files that it takes long to check Directory Traversal Vulnerability(DTV) problem. If you are sure this archive is safe, you can skip this scanning process. Do you want to scan for DTV problem?"), this) == wxYES)\r
        {\r
                wxNotebookEvent e;\r
                e.SetSelection(3);\r
@@ -382,10 +382,10 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
 \r
                // 各ファイルにパスを付加。\r
                bool fDTVWarning = false;\r
-               for (size_t i = 0; i < this->lcFiles->asInput.GetCount(); i++)\r
+               for (size_t i = 0; i < this->lcFiles->asInput->GetCount(); i++)\r
                {\r
                        wxString szOutputFile = szOutputRootDir + wxFileName::GetPathSeparator();\r
-                       wxFileName fnStored(this->lcFiles->asInput[i]);\r
+                       wxFileName fnStored(this->lcFiles->asInput->Item(i));\r
                        if (! this->cbIgnorePath->IsChecked())\r
                        {\r
                                szOutputFile += fnStored.GetPathWithSep();\r
@@ -413,13 +413,13 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
        case TPI_COMMAND_ADD:\r
        case TPI_COMMAND_CREATE:\r
                // TODO : 格納パスを推測。\r
-               this->lcFiles->asOutput = this->lcFiles->asInput;\r
-               this->lcFiles->apItem.SetCount(this->lcFiles->asInput.GetCount(), NULL);\r
+               this->lcFiles->asOutput = * this->lcFiles->asInput;\r
+               this->lcFiles->apItem.SetCount(this->lcFiles->asInput->GetCount(), NULL);\r
                break;\r
        }\r
 \r
        // リストビューに表示。\r
-       this->lcFiles->SetItemCount(this->lcFiles->asInput.GetCount());\r
+       this->lcFiles->SetItemCount(this->lcFiles->asInput->GetCount());\r
 }\r
 \r
 //******************************************************************************\r
@@ -437,7 +437,7 @@ wxString myListCtrl2::OnGetItemText(long i, long column) const
        switch (column)\r
        {\r
        case 0:\r
-               return this->asInput[i];\r
+               return this->asInput->Item(i);\r
        case 1:\r
                return this->asOutput[i];\r
        default:\r

diff --git a/src/lychee/dlg_make.h b/src/lychee/dlg_make.h
index 129de72..00b2d60 100644 (file)
--- a/src/lychee/dlg_make.h
+++ b/src/lychee/dlg_make.h
@@ -37,7 +37,7 @@ public:
        virtual wxString OnGetItemText(long, long) const;\r
        virtual wxListItemAttr * OnGetItemAttr(long) const;\r
 \r
-       wxArrayString asInput, asOutput;\r
+       wxArrayString * asInput, asOutput;\r
        wxArrayPtrVoid apItem;\r
        wxListItemAttr atDangerItem;\r
 \r