作成ダイアログのXRC読み込み部分を統合。

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

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index bf1507d..85dd147 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -36,6 +36,8 @@ WX_DEFINE_OBJARRAY(ArrayTPI_FORMATINFO);
 \r
 MakeDialog::MakeDialog(): wxDialog()\r
 {\r
+       ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_make.xrc"));\r
+       ::wxXmlResource::Get()->LoadDialog(this, this->GetParent(), wxT("dlg_make"));\r
        this->uCommand = TPI_COMMAND_CREATE;\r
 }\r
 \r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index 0b9b076..aea92d3 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -211,9 +211,6 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
 \r
        // 作成ダイアログを設定。\r
        MakeDialog mkDlg;\r
-       ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_make.xrc"));\r
-       ::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));\r
-\r
        if (e.GetClientData() == NULL)\r
        {\r
                // 処理対象のファイルを選択。\r
@@ -579,8 +576,6 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
 {\r
        // 作成ダイアログを設定。\r
        MakeDialog mkDlg;\r
-       ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_make.xrc"));\r
-       ::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));\r
        mkDlg.uCommand = TPI_COMMAND_ADD;\r
 \r
        // 処理対象のファイルを選択。\r
@@ -681,8 +676,6 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
 \r
        // 展開ダイアログを作成。DnDまたは実行時は表示しない。\r
        MakeDialog mkDlg;\r
-       ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_make.xrc"));\r
-       ::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));\r
        mkDlg.uCommand = TPI_COMMAND_EXTRACT;\r
        mkDlg.files    = MakeTargetFileList(this, nMode == 1);\r
 \r