From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Sun, 18 Oct 2009 09:20:37 +0000 (+0000)
Subject: XRCのロード部分をProcessDialog内に移動。
X-Git-Tag: 0.01beta4~28
X-Git-Url: http://git.osdn.net/view?p=tpi%2Flychee.git;a=commitdiff_plain;h=c47a661c9071c174b9921af1416a9b6a67fb8cc6

XRCのロード部分をProcessDialog内に移動。

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

diff --git a/src/frontend/dlg_process.cpp b/src/frontend/dlg_process.cpp
index 86ff09a..94185d2 100644
--- a/src/frontend/dlg_process.cpp
+++ b/src/frontend/dlg_process.cpp
@@ -30,6 +30,8 @@ ProcessDialog * g_procDlg = NULL;
 
 ProcessDialog::ProcessDialog(): wxDialog()
 {
+	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
+	::wxXmlResource::Get()->LoadDialog(this, this->GetParent(), wxT("dlg_process"));	
 }
 
 ProcessDialog::~ProcessDialog()
diff --git a/src/frontend/frm_main.cpp b/src/frontend/frm_main.cpp
index 18d8436..758eaee 100644
--- a/src/frontend/frm_main.cpp
+++ b/src/frontend/frm_main.cpp
@@ -234,7 +234,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
 	// ì¬ƒ_ƒCƒAƒƒO‚ðÝ’èB
 	MakeDialog mkDlg;
 	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_make.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));	
+	::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));
 
 	if (e.GetClientData() == NULL)
 	{
@@ -321,8 +321,6 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
 
 	// ˆ—‚ðs‚¤B
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));
 	procDlg.InitDialog();
 	procDlg.Show(true);
 	int nErrorCode = this->ErrorCheck(tpi.Command(TPI_COMMAND_ADD, & swInfo, fnArchive.GetFullPath(), mkDlg.files));
@@ -372,8 +370,6 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
 
 	// i’»ƒ_ƒCƒAƒƒO•\Ž¦B
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));	
 	procDlg.InitDialog();
 	procDlg.Show(true);
 
@@ -575,8 +571,6 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
 	wxString szArcName = this->statusbar->GetStatusText(4);
 
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));	
 	procDlg.InitDialog();
 	procDlg.Show(true);
 	this->ErrorCheck(this->tpi.Command(TPI_COMMAND_ADD, & swInfo, szArcName, files));
@@ -607,8 +601,6 @@ void MainFrame::OnArcConvert(wxCommandEvent& e)
 	files.Add(fd.GetPath());
 
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));
 	procDlg.InitDialog();
 	procDlg.Show(true);
 	this->ErrorCheck(this->tpi.Command(swInfo.fMakeSFX ? TPI_COMMAND_SFX : TPI_COMMAND_UNSFX, & swInfo, fnArchive.GetFullPath(), files));
@@ -627,6 +619,8 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
 
 	// “WŠJƒ_ƒCƒAƒƒO‚ðì¬BDnD‚Ü‚½‚ÍŽÀsŽž‚Í•\Ž¦‚µ‚È‚¢B
 	MakeDialog mkDlg;
+	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_make.xrc"));
+	::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));
 	mkDlg.bIsMake = false;
 	mkDlg.files   = MakeTargetFileList(this, nMode == 1);
 
@@ -654,8 +648,6 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
 	}
 	else
 	{
-		::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_make.xrc"));
-		::wxXmlResource::Get()->LoadDialog(& mkDlg, this, wxT("dlg_make"));
 		mkDlg.InitDialog();
 		if (mkDlg.ShowModal() == wxID_CANCEL)
 		{
@@ -681,8 +673,6 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
 	}
 
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));	
 	procDlg.InitDialog();
 	procDlg.Show(true);
 	int nErrorCode = this->ErrorCheck(this->tpi.Command(TPI_COMMAND_EXTRACT, & swInfo, this->statusbar->GetStatusText(4), mkDlg.files));
@@ -766,8 +756,6 @@ void MainFrame::OnArcDelete(wxCommandEvent& e)
 	wxArrayString files = MakeTargetFileList(this, false);
 
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));	
 	procDlg.InitDialog();
 	procDlg.Show(true);
 	this->ErrorCheck(this->tpi.Command(TPI_COMMAND_DELETE, & swInfo, szArcName, files));
@@ -785,8 +773,6 @@ void MainFrame::OnArcTest(wxCommandEvent&)
 	TPI_SWITCHES swInfo;
 
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));	
 	procDlg.InitDialog();
 	procDlg.Show(true);
 	if (this->ErrorCheck(this->tpi.Command(TPI_COMMAND_TEST, & swInfo, this->statusbar->GetStatusText(4), files)) == TPI_ERROR_SUCCESS)
@@ -803,8 +789,6 @@ void MainFrame::OnArcRepair(wxCommandEvent&)
 	TPI_SWITCHES swInfo;
 
 	ProcessDialog procDlg;
-	::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
-	::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process"));	
 	procDlg.InitDialog();
 	procDlg.Show(true);
 	this->ErrorCheck(this->tpi.Command(TPI_COMMAND_REPAIR, & swInfo, this->statusbar->GetStatusText(4), files));