微修正。

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

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 828e9da..9d04a41 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -232,7 +232,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        this->lcFiles->asOutput.Alloc(n);\r
        this->lcFiles->apItem.Alloc(n);\r
        if (n < 3000 ||\r
-               ::AskDlg(\r
+               AskDlg(\r
                        this->uCommand == TPI_COMMAND_EXTRACT ?\r
                                _("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?") :\r
                                _("The files you want to store are too many, so it takes long to check Directory Traversal Vulnerability(DTV) problem. If you are sure the path of the files are no problem, you can skip this scanning process. Do you want to scan for DTV problem?"),\r
@@ -460,7 +460,7 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
                                _("and some danger files may be stored!")\r
                        )\r
                );\r
-               if (::AskDlg(sz, this) == wxYES)\r
+               if (AskDlg(sz, this) == wxYES)\r
                {\r
                        this->cbIgnorePath->SetValue(true);\r
                        this->OnTabChanged(e);\r

diff --git a/src/lychee/dlg_process.cpp b/src/lychee/dlg_process.cpp
index 4dfd800..bec6d8f 100644 (file)
--- a/src/lychee/dlg_process.cpp
+++ b/src/lychee/dlg_process.cpp
@@ -136,7 +136,7 @@ void ProcessDialog::OnInit(wxInitDialogEvent &)
 \r
 void ProcessDialog::OnClose(wxCloseEvent & e)\r
 {\r
-       if (e.CanVeto() && ::AskDlg(_("Really do you want to cancel this operation?"), this) == wxYES)\r
+       if (e.CanVeto() && AskDlg(_("Really do you want to cancel this operation?"), this) == wxYES)\r
        {\r
                this->fCancel = true;\r
        }\r
@@ -400,7 +400,7 @@ void OverwriteDialog::OnInit(wxInitDialogEvent &)
 \r
 void OverwriteDialog::OnClose(wxCloseEvent & e)\r
 {\r
-       if (e.CanVeto() && ::AskDlg(_("Really do you want to cancel this operation?"), this) == wxYES)\r
+       if (e.CanVeto() && AskDlg(_("Really do you want to cancel this operation?"), this) == wxYES)\r
        {\r
                this->EndModal(wxID_CANCEL);\r
        }\r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index 9dd691d..52134ce 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -432,7 +432,7 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
                idArcRoot = this->tree_ctrl->AppendItem(idRoot, wxT("-----"), 0, 1);\r
 \r
        // 巨大書庫のときにファイル名検査を省略するか。\r
-       bool bDTVCheck = piInfo.fiInfo.nUnpackedSize < 10000 || ::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) == wxNO;\r
+       bool bDTVCheck = piInfo.fiInfo.nUnpackedSize < 10000 || 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) == wxNO;\r
 \r
        // ファイル情報をロード。\r
        if (tpi.GetFileInformation(& piInfo.fiInfo, true))\r
@@ -984,7 +984,7 @@ void MainFrame::OnArcDelete(wxCommandEvent& e)
                return;\r
        }\r
 \r
-       if (::AskDlg(_("Are you sure to delete selected files?"), this) == wxNO)\r
+       if (AskDlg(_("Are you sure to delete selected files?"), this) == wxNO)\r
        {\r
                return;\r
        }\r