Ignore:
Timestamp:
May 19, 2008, 5:10:15 PM (16 years ago)
Author:
dai_9181
Message:

・PROJECTINFO構造体を廃止し、Projectクラスを採用した。
・ProjectInfoをprojectInfoにリネーム

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

    r616 r618  
    8888
    8989    //プロジェクトを閉じる
    90     if(ProjectInfo.name[0]){
     90    if(projectInfo.name[0]){
    9191        if(!CloseProject()) return;
    9292    }
     
    446446        lstrcpy(temporary,NewFileName);
    447447        if(!strstr(temporary,".")) lstrcat(temporary,".ab");
    448         GetFullPath(temporary,ProjectInfo.dir);
     448        GetFullPath(temporary,projectInfo.dir);
    449449    }
    450450    else bAddToProject=0;
     
    521521void MainFrame::OnCmdProjectFolderOpen( UINT uNotifyCode, int nID, CWindow wndCtl )
    522522{
    523     ShellExecute(m_hWnd,"explore",ProjectInfo.dir,NULL,NULL,SW_SHOWNORMAL);
     523    ShellExecute(m_hWnd,"explore",projectInfo.dir,NULL,NULL,SW_SHOWNORMAL);
    524524}
    525525
     
    550550        if(MdiInfo[i].hwnd) SaveDocument(MdiInfo[i].hwnd,NULL);
    551551    }
    552     if(ProjectInfo.name[0]) SaveProject();
     552    if(projectInfo.name[0]) SaveProject();
    553553}
    554554
     
    935935
    936936    HWND hChild = ::GetWindow(hClient,GW_CHILD);
    937     if(ProjectInfo.name[0]){
     937    if(projectInfo.name[0]){
    938938        //プロジェクトが開かれている場合
    939939        if(!SetProjectToRun()) return;
    940940
    941941        //デバッグ用のコマンドライン及び実行可能ファイル(DLLのみ)
    942         sprintf(temporary,"%s\r\n%s",ProjectInfo.szExePath,ProjectInfo.szCmdLine);
     942        sprintf(temporary,"%s\r\n%s",projectInfo.szExePath,projectInfo.szCmdLine);
    943943        sprintf(temp2,"%spgm.tmp",pj_editor_Dir);
    944944        HANDLE hFile=CreateFile(temp2,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
     
    948948
    949949        //ソースファイル名をtemp2へ
    950         ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);
     950        projectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);
    951951
    952952        //出力ファイル名をtemp3へ
    953         lstrcpy(temp3,ProjectInfo.lpszOutput_Debug);
    954         GetFullPath(temp3,ProjectInfo.dir);
     953        lstrcpy(temp3,projectInfo.lpszOutput_Debug);
     954        GetFullPath(temp3,projectInfo.dir);
    955955
    956956        if(IsNeedCompileForProject(1))
     
    960960
    961961        // DLLオプション
    962         if(ProjectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");
     962        if(projectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");
    963963
    964964        // SLLオプション
    965         if( ProjectInfo.dwModuleType == MT_SLL ) lstrcat( temporary, " /static_library" );
     965        if( projectInfo.dwModuleType == MT_SLL ) lstrcat( temporary, " /static_library" );
    966966
    967967        //Unicodeオプション
    968         if(ProjectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");
     968        if(projectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");
    969969
    970970        //ブレークポイントをセーブ
    971         ProjectInfo.pobj_DBBreakPoint->SaveToTempFile();
     971        projectInfo.pobj_DBBreakPoint->SaveToTempFile();
    972972    }
    973973    else{
     
    10151015
    10161016    HWND hChild=::GetWindow(hClient,GW_CHILD);
    1017     if(ProjectInfo.name[0]){
     1017    if(projectInfo.name[0]){
    10181018        //プロジェクトが開かれている場合
    10191019        if(!SetProjectToRun()) return;
    10201020
    10211021        //ソースファイル名をtemp2へ
    1022         ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);
     1022        projectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);
    10231023
    10241024        //出力ファイル名をtemp3へ
    1025         lstrcpy(temp3,ProjectInfo.lpszOutput_Debug);
    1026         GetFullPath(temp3,ProjectInfo.dir);
     1025        lstrcpy(temp3,projectInfo.lpszOutput_Debug);
     1026        GetFullPath(temp3,projectInfo.dir);
    10271027
    10281028        sprintf(temporary,"\"%s\" \"%s\" /debug /wnd:%08x",temp2,temp3,m_hWnd);
    10291029
    10301030        //DLLオプション
    1031         if(ProjectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");
     1031        if(projectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");
    10321032
    10331033        //Unicodeオプション
    1034         if(ProjectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");
     1034        if(projectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");
    10351035    }
    10361036    else{
     
    11261126
    11271127    HWND hChild=::GetWindow(hClient,GW_CHILD);
    1128     if(ProjectInfo.name[0]){
     1128    if(projectInfo.name[0]){
    11291129        //プロジェクトが開かれている場合
    11301130        if(!SetProjectToRun()) return;
    11311131
    11321132        //ソースファイル名をtemp2へ
    1133         ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);
     1133        projectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);
    11341134
    11351135        //出力ファイル名をtemp3へ
    1136         lstrcpy(temp3,ProjectInfo.lpszOutput_Release);
    1137         GetFullPath(temp3,ProjectInfo.dir);
     1136        lstrcpy(temp3,projectInfo.lpszOutput_Release);
     1137        GetFullPath(temp3,projectInfo.dir);
    11381138
    11391139        sprintf(temporary,"\"%s\" \"%s\" /wnd:%08x",temp2,temp3,m_hWnd);
    11401140
    11411141        //DLLオプション
    1142         if(ProjectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");
     1142        if(projectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");
    11431143
    11441144        //Unicodeオプション
    1145         if(ProjectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");
     1145        if(projectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");
    11461146    }
    11471147    else{
     
    11821182
    11831183    HWND hChild=::GetWindow(hClient,GW_CHILD);
    1184     if(ProjectInfo.name[0]){
     1184    if(projectInfo.name[0]){
    11851185/*                      //プロジェクトが開かれている場合
    11861186        if(!SetProjectToRun()) return;
     
    11901190            SendMessage(WM_COMMAND,IDM_RELEASECOMPILE,0);*/
    11911191
    1192         if(ProjectInfo.dwModuleType==MT_DLL){
    1193             lstrcpy(temporary,ProjectInfo.szExePath);
     1192        if(projectInfo.dwModuleType==MT_DLL){
     1193            lstrcpy(temporary,projectInfo.szExePath);
    11941194        }
    11951195        else{
    1196             lstrcpy(temporary,ProjectInfo.lpszOutput_Debug);
    1197             GetFullPath(temporary,ProjectInfo.dir);
     1196            lstrcpy(temporary,projectInfo.lpszOutput_Debug);
     1197            GetFullPath(temporary,projectInfo.dir);
    11981198        }
    11991199    }
     
    12361236void MainFrame::OnCmdBreakPoint( UINT uNotifyCode, int nID, CWindow wndCtl )
    12371237{
    1238     if(ProjectInfo.name[0]){
    1239         ProjectInfo.pobj_DBBreakPoint->Event_BreakPoint();
     1238    if(projectInfo.name[0]){
     1239        projectInfo.pobj_DBBreakPoint->Event_BreakPoint();
    12401240    }
    12411241    else{
Note: See TracChangeset for help on using the changeset viewer.