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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

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

@@ -42 +42 @@
 LRESULT CALLBACK TabProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern LPSTR DefFileFilter;
     int i,i2,WndNum;
@@ -1057 +1056 @@
         windowInfos.push_back( new ActiveBasic::PM::WindowInfo() );
         windowInfos.back()->SetName( "MainWnd" );
-        windowInfos.back()->SetHandleName( "hMainWnd" );
         windowInfos.back()->pos.x=CW_USEDEFAULT;
         windowInfos.back()->pos.y=CW_USEDEFAULT;
@@ -1077 +1075 @@
         windowInfos.back()->SetIconResourceName( "" );
         windowInfos.back()->SetClassName( "NORMAL" );
-        windowInfos.back()->CallBackName="MainWndProc";
-        windowInfos.back()->type=WNDTYPE_DEFAULT;
-        windowInfos.back()->filepath="MainWnd.ab";
+        windowInfos.back()->SetType( ActiveBasic::PM::WindowType::Default );
         sprintf(temporary,"%s%s.wnd",dir,NewProjectInfo.name);
 
@@ -1244 +1240 @@
     //////////////////////////////////////////
     //ワークファイル（*.wrk）をオープン
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HTREEITEM hTreeItem;
     HANDLE hFind;
@@ -1571 +1566 @@
 }
 BOOL ProjectModifyCheck(BOOL bRun){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum,sw;
     HWND hChild;
@@ -1601 +1595 @@
                 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){
                     projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1;
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) sw=1;
                 }
             }
@@ -1611 +1605 @@
                     lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1;
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) sw=1;
                 }
             }
@@ -1639 +1633 @@
 }
 void MakeWorkFile(void){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,WndNum;
     char temporary[MAX_PATH],buffer[32767];
@@ -1658 +1651 @@
             for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){
                 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                     TextEdit_GetSel(WndNum,&CharRange);
 
@@ -1684 +1677 @@
             BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
             {
-                if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str())==0){
-                    sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum].path);
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),pWindowInfo->GetName().c_str())==0){
+                    sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum].path.c_str());
                     i2+=lstrlen(buffer+i2);
                     break;
@@ -1693 +1686 @@
         else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
             for(i=0;i<projectInfo.NumberOfMenu;i++){
-                if(lstrcmpi(MdiInfo[WndNum].path,projectInfo.pMenuInfo[i].IdName)==0){
-                    sprintf(buffer+i2,"menu,%s\r\n",MdiInfo[WndNum].path);
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),projectInfo.pMenuInfo[i].IdName)==0){
+                    sprintf(buffer+i2,"menu,%s\r\n",MdiInfo[WndNum].path.c_str());
                     i2+=lstrlen(buffer+i2);
                     break;
@@ -1705 +1698 @@
                 lstrcpy(temporary,resourceItem.filepath.c_str());
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                     sprintf(buffer+i2,"icon,%s\r\n",resourceItem.filepath.c_str());
                     i2+=lstrlen(buffer+i2);