Changeset 625 in dev for trunk/ab5.0/abdev/abdev/src/ProjectManager

Timestamp:

May 27, 2008, 9:17:34 PM (16 years ago)

Author:

dai_9181

Message:

・WindowInfoクラスをリファクタリング
・MdiInfoを単純配列からvectorに変更した。

File:

• trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp (modified) (8 diffs)

trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp

@@ -267 +267 @@
 void Project::Save()
 {
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,WndNum;
     char temporary[MAX_PATH],buffer[32767];
@@ -284 +283 @@
                 for(i=0;i<this->pobj_DBFileInfo->iNum;i++){
                     this->pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                         SaveDocument(hChild,NULL);
                         break;
@@ -297 +296 @@
                     lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                         SaveDocument(hChild,NULL);
                         break;
@@ -533 +532 @@
 {
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;
     HWND hChild,hCloseChild;
@@ -553 +551 @@
             for(i=0;i<this->pobj_DBFileInfo->iNum;i++){
                 this->pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
 
                     //変更フラグをオフにする
@@ -575 +573 @@
         else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
             for(i=0;i<this->NumberOfMenu;i++){
-                if(lstrcmp(MdiInfo[WndNum].path,this->pMenuInfo[i].IdName)==0){
+                if( MdiInfo[WndNum].path == this->pMenuInfo[i].IdName )
+                {
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;
@@ -585 +584 @@
                 lstrcpy(temporary,this->resourceManager.iconResources[i].filepath.c_str());
                 lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;
@@ -602 +601 @@
     BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, windowInfos )
     {
-        HeapDefaultFree(pWindowInfo->CallBackName);
-        HeapDefaultFree(pWindowInfo->filepath);
-
         //子ウィンドウのメモリを解放
         BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildWindowInfo, pWindowInfo->childWindowInfos )