Changeset 651 in dev for trunk/ab5.0/abdev/abdev/ProjectControl.cpp

Timestamp:

Jun 17, 2008, 9:30:54 PM (16 years ago)

Author:

dai_9181

Message:

・BreakPoint周りをリファクタリング
・FileTree周りをリファクタリング

File:

• trunk/ab5.0/abdev/abdev/ProjectControl.cpp (modified) (13 diffs)

trunk/ab5.0/abdev/abdev/ProjectControl.cpp

@@ -135 +135 @@
                                 // 対象ファイルを開く
                                 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 +403 @@
 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 +409 @@
 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 +415 @@
 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 +455 @@
 
             //ファイルツリービューを作成
-            pobj_FileTree=new CFileTree(hProjectViewTab);
+            pobj_FileTree = new FileListTreeViewCtrl( hProjectViewTab );
 
             //クラスツリービューを作成
@@ -494 +494 @@
             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 +605 @@
                 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 +623 @@
                 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 +687 @@
 
     //ツリービューから削除
-    TreeView_DeleteItem(pobj_FileTree->hTree,hTreeItem);
+    pobj_FileTree->DeleteItem( hTreeItem );
 
     //projectInfo.pobj_DBFileInfoオブジェクトから削除
@@ -1407 +1407 @@
                 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 +1532 @@
                 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 +1670 @@
 
                     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 +1724 @@
     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;