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

Timestamp:

May 19, 2008, 3:03:33 PM (17 years ago)

Author:

dai_9181

Message:

CHILDINFOの管理方法をstd::vectorに変更。

File:

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

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

@@ -1076 +1076 @@
         windowInfos.back()->type=WNDTYPE_DEFAULT;
         windowInfos.back()->filepath="MainWnd.ab";
-        windowInfos.back()->NumberOfChildWindows=0;
         sprintf(temporary,"%s%s.wnd",dir,NewProjectInfo.name);
 
@@ -1944 +1943 @@
 
         //子ウィンドウのメモリを解放
-        for(i2=0;i2<pWindowInfo->NumberOfChildWindows;i2++){
-            HeapDefaultFree(pWindowInfo->pChildInfo[i2].IdName);
-            HeapDefaultFree(pWindowInfo->pChildInfo[i2].caption);
-            if(pWindowInfo->pChildInfo[i2].Control==CT_IMAGEBOX){
+        for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){
+            HeapDefaultFree(pWindowInfo->childWindowInfos[i2]->IdName);
+            HeapDefaultFree(pWindowInfo->childWindowInfos[i2]->caption);
+            if(pWindowInfo->childWindowInfos[i2]->Control==CT_IMAGEBOX){
                 //イメージ ボックスの場合
-                HeapDefaultFree(pWindowInfo->pChildInfo[i2].ImageCtrlInfo.path);
-            }
-        }
-        HeapDefaultFree(pWindowInfo->pChildInfo);
+                HeapDefaultFree(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path);
+            }
+
+            delete pWindowInfo->childWindowInfos[i2];
+        }
+        pWindowInfo->childWindowInfos.clear();
     }
     ProjectInfo.windowInfos.Clear();