ProcessDialogのコンストラクタに渡す引数を削減。

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

diff --git a/src/lychee/dlg_process.cpp b/src/lychee/dlg_process.cpp
index ea1d834..568db33 100644 (file)
--- a/src/lychee/dlg_process.cpp
+++ b/src/lychee/dlg_process.cpp
@@ -31,14 +31,14 @@ ProcessDialog * g_procDlg = NULL;
 // ProcessDialog\r
 //******************************************************************************\r
 \r
-ProcessDialog::ProcessDialog(wxWindow * parent, wxFileName * fn, wxULongLong_t n, wxString szPassword): wxDialog(), fnArchive(fn), nFileCount(n), szPassword(szPassword)\r
+ProcessDialog::ProcessDialog(wxWindow * parent, wxULongLong_t n, wxString szPassword): wxDialog(), nFileCount(n), szPassword(szPassword)\r
 {\r
        ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_process.xrc"));\r
        ::wxXmlResource::Get()->LoadDialog(this, this->GetParent(), wxT("dlg_process"));\r
        g_procDlg = this;\r
+       this->hParent = parent;\r
 #ifdef __WINDOWS__\r
        this->hTBWnd = parent->IsShown() ? parent->GetHandle() : this->GetHandle();\r
-       this->hParent = parent;\r
        ((MainFrame *) this->hParent)->list_ctrl->Freeze();\r
 #endif\r
 }\r
@@ -85,7 +85,7 @@ void ProcessDialog::OnInit(wxInitDialogEvent &)
        TPI_PROCESSINFO piInfo;\r
        piInfo.eMessage = TPI_MESSAGE_STATUS;\r
        piInfo.eStatus = 0x1000;\r
-       piInfo.fiInfo.fnFileName = * this->fnArchive;\r
+       piInfo.fiInfo.fnFileName = ((MainFrame *) this->hParent)->fnArchive;\r
        piInfo.fiInfo.nUnpackedSize = this->nFileCount;\r
        this->CallbackProc(TPI_NOTIFY_COMMON, & piInfo);\r
 \r

diff --git a/src/lychee/dlg_process.h b/src/lychee/dlg_process.h
index a7d57d8..a936556 100644 (file)
--- a/src/lychee/dlg_process.h
+++ b/src/lychee/dlg_process.h
@@ -31,10 +31,9 @@ public:
        void OnClose(wxCloseEvent &);\r
        int CallbackProc(unsigned int, void *);\r
 \r
-       ProcessDialog(wxWindow * parent, wxFileName * fn = NULL, wxULongLong_t n = 0, wxString szPassword = wxEmptyString);\r
+       ProcessDialog(wxWindow * parent, wxULongLong_t n = 0, wxString szPassword = wxEmptyString);\r
        ~ProcessDialog();\r
 \r
-       wxFileName * fnArchive;\r
        wxULongLong_t nFileCount;\r
        wxString szPassword;\r
 \r
@@ -48,8 +47,8 @@ private:
        wxTextCtrl* ebSource;\r
        wxGauge* gFile;\r
        wxGauge* gArchive;\r
-#ifdef __WINDOWS__\r
        wxWindow* hParent;\r
+#ifdef __WINDOWS__\r
        HWND hTBWnd;\r
        ITaskbarList3 * tlTaskbar;\r
 #endif\r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index c23a0c2..b4ccb30 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -275,7 +275,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
 \r
        // 処理を行う。\r
        {\r
-               ProcessDialog procDlg(this, & this->fnArchive, mkDlg.files.GetCount());\r
+               ProcessDialog procDlg(this, mkDlg.files.GetCount());\r
                procDlg.Show(true);\r
 \r
                tpi.Command(TPI_COMMAND_CREATE, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files);\r
@@ -318,7 +318,7 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
        }\r
 \r
        // 進捗ダイアログ表示。\r
-       ProcessDialog procDlg(this, & this->fnArchive);\r
+       ProcessDialog procDlg(this);\r
        procDlg.Show(true);\r
 \r
        // DnD以外で書庫を開く場合、TPIを読み込み。\r
@@ -675,7 +675,7 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
 \r
        // 処理を行う。\r
        {\r
-               ProcessDialog procDlg(this, & this->fnArchive, mkDlg.files.GetCount(), this->szPassword);\r
+               ProcessDialog procDlg(this, mkDlg.files.GetCount(), this->szPassword);\r
                procDlg.Show(true);\r
 \r
                tpi.Command(TPI_COMMAND_ADD, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files);\r
@@ -788,7 +788,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
 \r
        // 処理を行う。\r
        {\r
-               ProcessDialog procDlg(this, & this->fnArchive, mkDlg.files.GetCount(), this->szPassword);\r
+               ProcessDialog procDlg(this, mkDlg.files.GetCount(), this->szPassword);\r
                procDlg.Show(true);\r
 \r
                tpi.Command(TPI_COMMAND_EXTRACT, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files);\r
@@ -927,7 +927,7 @@ void MainFrame::OnArcDelete(wxCommandEvent& e)
        // 処理を行う。\r
        {\r
                wxArrayString asFiles = MakeTargetFileList(this);\r
-               ProcessDialog procDlg(this, & this->fnArchive, asFiles.GetCount(), this->szPassword);\r
+               ProcessDialog procDlg(this, asFiles.GetCount(), this->szPassword);\r
                procDlg.Show(true);\r
 \r
                TPI_SWITCHES swInfo;\r
@@ -945,7 +945,7 @@ void MainFrame::OnArcTest(wxCommandEvent&)
 {\r
        // 処理を行う。\r
        wxArrayString asFiles = MakeTargetFileList(this);\r
-       ProcessDialog procDlg(this, & this->fnArchive, asFiles.GetCount(), this->szPassword);\r
+       ProcessDialog procDlg(this, asFiles.GetCount(), this->szPassword);\r
        procDlg.Show(true);\r
 \r
        TPI_SWITCHES swInfo;\r
@@ -959,7 +959,7 @@ void MainFrame::OnArcRepair(wxCommandEvent&)
 {\r
        // 処理を行う。\r
        wxArrayString asFiles = MakeTargetFileList(this);\r
-       ProcessDialog procDlg(this, & this->fnArchive, asFiles.GetCount(), this->szPassword);\r
+       ProcessDialog procDlg(this, asFiles.GetCount(), this->szPassword);\r
        procDlg.Show(true);\r
 \r
        TPI_SWITCHES swInfo;\r