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 (file)
--- a/src/frontend/dlg_process.cpp
+++ b/src/frontend/dlg_process.cpp
@@ -30,6 +30,8 @@ ProcessDialog * g_procDlg = NULL;
 \r
 ProcessDialog::ProcessDialog(): wxDialog()\r
 {\r
+       ::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc"));
+       ::wxXmlResource::Get()->LoadDialog(this, this->GetParent(), wxT("dlg_process"));        
 }\r
 \r
 ProcessDialog::~ProcessDialog()\r

diff --git a/src/frontend/frm_main.cpp b/src/frontend/frm_main.cpp
index 18d8436..758eaee 100644 (file)
--- a/src/frontend/frm_main.cpp
+++ b/src/frontend/frm_main.cpp
@@ -234,7 +234,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
        // \8dì\90¬\83_\83C\83A\83\8d\83O\82ð\90Ý\92è\81B
        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)
 
        // \8f\88\97\9d\82ð\8ds\82¤\81B
        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)
 
        // \90i\92»\83_\83C\83A\83\8d\83O\95\\8e¦\81B
        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)
 
        // \93W\8aJ\83_\83C\83A\83\8d\83O\82ð\8dì\90¬\81BDnD\82Ü\82½\82Í\8eÀ\8ds\8e\9e\82Í\95\\8e¦\82µ\82È\82¢\81B
        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));