From ceb1222213f9175a1f535d5694e5740b8c505424 Mon Sep 17 00:00:00 2001
From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Sun, 9 Jan 2011 09:48:08 +0000
Subject: [PATCH] =?utf8?q?=E4=BD=9C=E6=88=90=E3=83=80=E3=82=A4=E3=82=A2?=
 =?utf8?q?=E3=83=AD=E3=82=B0=E3=81=AEXRC=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?utf8?q?=E3=81=BF=E9=83=A8=E5=88=86=E3=82=92=E7=B5=B1=E5=90=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@465 9df91469-1e22-0410-86e7-ea8537beb833
---
 src/lychee/dlg_make.cpp | 2 ++
 src/lychee/frm_main.cpp | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

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