Linuxで書庫のロード時にセグメンテーション違反を起こしていたのを修正。

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

diff --git a/src/frontend/frm_main.cpp b/src/frontend/frm_main.cpp
index 4818eef..df682f7 100644 (file)
--- a/src/frontend/frm_main.cpp
+++ b/src/frontend/frm_main.cpp
@@ -141,8 +141,8 @@ void MainFrame::OnInit(wxInitDialogEvent&)
        this->statusbar = XRCCTRL(* this, "statusbar", wxStatusBar);
        this->tree_ctrl = XRCCTRL(* this, "TreeView", wxTreeCtrl);
        this->list_ctrl = XRCCTRL(* this, "ListView", myListCtrl);
-       this->tcFilter  = XRCCTRL(* this, "tcFilter", wxTextCtrl);
        this->window_splitter = XRCCTRL(* this, "window_splitter", wxSplitterWindow);
+       this->tcFilter  = XRCCTRL(* this->toolbar, "tcFilter", wxTextCtrl);
 
        // \90Ý\92è\82ð\93Ç\82Ý\8d\9e\82Ý\81B
        wxFileConfig fc(wxEmptyString, wxEmptyString, ::wxGetCwd() + wxT("/frontend.conf"), wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
@@ -873,6 +873,7 @@ void MainFrame::OnTreeChanged(wxTreeEvent& e)
                        this->list_ctrl->showFileInfo.Add(this->fileinfo[i]);
                }
        }
+
        // \83\\81[\83g\82µ\82Ä\95\\8e¦\81B
        this->list_ctrl->showFileInfo.Sort(& ListCtrlCompareProc);
        this->list_ctrl->SetItemCount(this->list_ctrl->showFileInfo.Count());
@@ -882,10 +883,10 @@ void MainFrame::OnTreeBeginDrag(wxTreeEvent& e)
 {
        // TODO : \83A\83C\83e\83\80\82ª\8eq\8aK\91w\82ð\8e\9d\82Á\82Ä\82¢\82Ä\82à\93W\8aJ\82Å\82«\82È\82¢\81B
        this->tree_ctrl->SelectItem(e.GetItem());
-       for (int i = 0; i < this->list_ctrl->GetItemCount(); i++)\r
-       {\r
-               this->list_ctrl->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);\r
-       }\r
+       for (int i = 0; i < this->list_ctrl->GetItemCount(); i++)
+       {
+               this->list_ctrl->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+       }
 
        wxCommandEvent e1;
        e1.SetInt(3);