Index: trunk/ab5.0/abdev/abdev/ProjectControl.cpp
===================================================================
--- trunk/ab5.0/abdev/abdev/ProjectControl.cpp	(revision 629)
+++ trunk/ab5.0/abdev/abdev/ProjectControl.cpp	(revision 651)
@@ -135,5 +135,5 @@
 								// 対象ファイルを開く
 								lstrcpy(temporary,
-									projectInfo.pobj_DBFileInfo->ppobj_FileInfo[pobj_ClassTreeView->pProcInfo[i].FileNum]->m_path);
+									projectInfo.pobj_DBFileInfo->ppobj_FileInfo[pobj_ClassTreeView->pProcInfo[i].FileNum]->GetPath().c_str());
 								lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
 								hChild=OpenFileWithExtension(temporary);
@@ -403,5 +403,5 @@
 void ShowFileView(){
 	TabCtrl_SetCurSel(hProjectViewTab,0);
-	ShowWindow(pobj_FileTree->hTree,SW_SHOW);
+	pobj_FileTree->ShowWindow( SW_SHOW );
 	ShowWindow(hProcedureTreeView,SW_HIDE);
 	ShowWindow(hMaterialTreeView,SW_HIDE);
@@ -409,5 +409,5 @@
 void ShowClassView(){
 	TabCtrl_SetCurSel(hProjectViewTab,1);
-	ShowWindow(pobj_FileTree->hTree,SW_HIDE);
+	pobj_FileTree->ShowWindow( SW_HIDE );
 	ShowWindow(hMaterialTreeView,SW_HIDE);
 	ShowWindow(hProcedureTreeView,SW_SHOW);
@@ -415,5 +415,5 @@
 void ShowMaterialView(){
 	TabCtrl_SetCurSel(hProjectViewTab,2);
-	ShowWindow(pobj_FileTree->hTree,SW_HIDE);
+	pobj_FileTree->ShowWindow( SW_HIDE );
 	ShowWindow(hProcedureTreeView,SW_HIDE);
 	ShowWindow(hMaterialTreeView,SW_SHOW);
@@ -455,5 +455,5 @@
 
 			//ファイルツリービューを作成
-			pobj_FileTree=new CFileTree(hProjectViewTab);
+			pobj_FileTree = new FileListTreeViewCtrl( hProjectViewTab );
 
 			//クラスツリービューを作成
@@ -494,5 +494,5 @@
 			TreeView_SetImageList(hMaterialTreeView,hMaterialTreeViewImageList,TVSIL_NORMAL);
 
-			ShowWindow(pobj_FileTree->hTree,SW_SHOW);
+			pobj_FileTree->ShowWindow( SW_SHOW );
 			GetClientRect(hwnd,&rect);
 			SendMessage(hwnd,WM_SIZE,0,MAKELONG(rect.right,rect.bottom));
@@ -605,5 +605,5 @@
 				rect.bottom++;
 
-				pobj_FileTree->resize(rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top);
+				pobj_FileTree->MoveWindow(rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top);
 				MoveWindow(hProcedureTreeView,
 					rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top,1);
@@ -623,5 +623,5 @@
 				TabCtrl_AdjustRect(hProjectViewTab,FALSE,&rect);
 
-				pobj_FileTree->resize(rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top);
+				pobj_FileTree->MoveWindow(rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top);
 				MoveWindow(hProcedureTreeView,
 					rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top,1);
@@ -687,5 +687,5 @@
 
 	//ツリービューから削除
-	TreeView_DeleteItem(pobj_FileTree->hTree,hTreeItem);
+	pobj_FileTree->DeleteItem( hTreeItem );
 
 	//projectInfo.pobj_DBFileInfoオブジェクトから削除
@@ -1407,5 +1407,8 @@
 				temporary[i2]=buffer[i];
 			}
-			if(temporary[0]=='1') TreeView_Expand(pobj_FileTree->hTree,TreeView_GetRoot(pobj_FileTree->hTree),TVE_EXPAND);
+			if(temporary[0]=='1')
+			{
+				pobj_FileTree->Expand( pobj_FileTree->GetRootItem(), TVE_EXPAND );
+			}
 
 			for(i+=2,i2=0;;i++,i2++){
@@ -1529,5 +1532,8 @@
 				temporary[i2]=buffer[i];
 			}
-			if(temporary[0]=='1') TreeView_Expand(pobj_FileTree->hTree,TreeView_GetRoot(pobj_FileTree->hTree),TVE_EXPAND);
+			if(temporary[0]=='1')
+			{
+				pobj_FileTree->Expand( pobj_FileTree->GetRootItem(), TVE_EXPAND );
+			}
 
 			for(i+=2,i2=0;;i++,i2++){
@@ -1664,5 +1670,5 @@
 
 					sprintf(buffer+i2,"text,\"%s\",%d,%d,%d,%d\r\n",
-						projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->m_path,
+						projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetPath().c_str(),
 						pos.x,
 						pos.y,
@@ -1718,6 +1724,6 @@
 	memset(&tvItem,0,sizeof(TVITEM));
 	tvItem.mask=TVIF_HANDLE|TVIF_STATE;
-	tvItem.hItem=TreeView_GetRoot(pobj_FileTree->hTree);
-	TreeView_GetItem(pobj_FileTree->hTree,&tvItem);
+	tvItem.hItem = pobj_FileTree->GetRootItem();
+	pobj_FileTree->GetItem( &tvItem );
 	if(tvItem.state&TVIS_EXPANDED) i=1;
 	else i=0;
