不要なInitDialog呼び出しを削除。

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

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 37d9674..04b5cf2 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -92,12 +92,6 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        // "Files"タブ\r
        this->lcFiles           = XRCCTRL(* this, "lcFiles",      myListCtrl2);\r
 \r
-       // 2回目以降は無視。\r
-       if (! this->cbDir->GetValue().IsEmpty())\r
-       {\r
-               return;\r
-       }\r
-\r
        // ListCtrlに列を追加。\r
        // wxGTKでは直接wxLC_VIRTUALを指定しないと反映されない。\r
        this->lcFiles->SetSingleStyle(wxLC_VIRTUAL);\r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index ad53595..86cb376 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -240,7 +240,6 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
        this->fnArchive.SetPath(swInfo.fnDestinationDirectory.GetPath());\r
 \r
        // ダイアログを表示。\r
-       mkDlg.InitDialog();\r
        if (mkDlg.ShowModal() == wxID_CANCEL)\r
        {\r
                return;\r
@@ -277,7 +276,6 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
 \r
        // 処理を行う。\r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
        if (! tpi.Command(TPI_COMMAND_CREATE, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files))\r
        {\r
@@ -324,7 +322,6 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
 \r
        // 進捗ダイアログ表示。\r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
 \r
        // TPIを読み込み、最初のコールバックを送信。\r
@@ -532,7 +529,6 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
        this->conf.WriteHistory(CONF_HISTORY_PATH, fd.GetDirectory());\r
 \r
        // ダイアログを表示。\r
-       mkDlg.InitDialog();\r
        if (mkDlg.ShowModal() == wxID_CANCEL)\r
        {\r
                return;\r
@@ -554,7 +550,6 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
        swInfo.szComment            = mkDlg.tcComment->GetValue();\r
 \r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
        if (! this->tpi.Command(TPI_COMMAND_ADD, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files))\r
        {\r
@@ -599,7 +594,6 @@ void MainFrame::OnArcConvert(wxCommandEvent& e)
        files.Add(fd.GetPath());\r
 \r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
        if (! this->tpi.Command(swInfo.fMakeSFX ? TPI_COMMAND_SFX : TPI_COMMAND_UNSFX, & swInfo, this->fnArchive.GetFullPath(), files))\r
        {\r
@@ -660,7 +654,6 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
        }\r
        else\r
        {\r
-               mkDlg.InitDialog();\r
                if (mkDlg.ShowModal() == wxID_CANCEL)\r
                {\r
                        return;\r
@@ -685,7 +678,6 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
        }\r
 \r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
        if (! this->tpi.Command(TPI_COMMAND_EXTRACT, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files))\r
        {\r
@@ -781,7 +773,6 @@ void MainFrame::OnArcDelete(wxCommandEvent& e)
        // 各種設定。\r
        TPI_SWITCHES swInfo;\r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
        if (! this->tpi.Command(TPI_COMMAND_DELETE, & swInfo, this->fnArchive.GetFullPath(), MakeTargetFileList(this, false)))\r
        {\r
@@ -797,7 +788,6 @@ void MainFrame::OnArcTest(wxCommandEvent&)
 {\r
        TPI_SWITCHES swInfo;\r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
        bool bIsCorrect = this->tpi.Command(TPI_COMMAND_TEST, & swInfo, this->fnArchive.GetFullPath(), MakeTargetFileList(this, false));\r
        procDlg.Show(false);\r
@@ -815,7 +805,6 @@ void MainFrame::OnArcRepair(wxCommandEvent&)
 {\r
        TPI_SWITCHES swInfo;\r
        ProcessDialog procDlg;\r
-       procDlg.InitDialog();\r
        procDlg.Show(true);\r
        if (! this->tpi.Command(TPI_COMMAND_REPAIR, & swInfo, this->fnArchive.GetFullPath(), MakeTargetFileList(this, false)))\r
        {\r

diff --git a/src/lychee/lychee.vcproj b/src/lychee/lychee.vcproj
index 8e62bfb..a9de80d 100644 (file)
--- a/src/lychee/lychee.vcproj
+++ b/src/lychee/lychee.vcproj
@@ -55,7 +55,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxmsw28u_adv.lib wxexpat.lib wxmsw28u_html.lib wxbase28u_xml.lib wxmsw28u_xrc.lib comctl32.lib"\r
+                               AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxmsw29u_adv.lib wxexpat.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_xrc.lib comctl32.lib"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r