Changeset 618 in dev for trunk/ab5.0/abdev/abdev/src/MainFrame.cpp
- Timestamp:
- May 19, 2008, 5:10:15 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/abdev/src/MainFrame.cpp
r616 r618 88 88 89 89 //プロジェクトを閉じる 90 if( ProjectInfo.name[0]){90 if(projectInfo.name[0]){ 91 91 if(!CloseProject()) return; 92 92 } … … 446 446 lstrcpy(temporary,NewFileName); 447 447 if(!strstr(temporary,".")) lstrcat(temporary,".ab"); 448 GetFullPath(temporary, ProjectInfo.dir);448 GetFullPath(temporary,projectInfo.dir); 449 449 } 450 450 else bAddToProject=0; … … 521 521 void MainFrame::OnCmdProjectFolderOpen( UINT uNotifyCode, int nID, CWindow wndCtl ) 522 522 { 523 ShellExecute(m_hWnd,"explore", ProjectInfo.dir,NULL,NULL,SW_SHOWNORMAL);523 ShellExecute(m_hWnd,"explore",projectInfo.dir,NULL,NULL,SW_SHOWNORMAL); 524 524 } 525 525 … … 550 550 if(MdiInfo[i].hwnd) SaveDocument(MdiInfo[i].hwnd,NULL); 551 551 } 552 if( ProjectInfo.name[0]) SaveProject();552 if(projectInfo.name[0]) SaveProject(); 553 553 } 554 554 … … 935 935 936 936 HWND hChild = ::GetWindow(hClient,GW_CHILD); 937 if( ProjectInfo.name[0]){937 if(projectInfo.name[0]){ 938 938 //プロジェクトが開かれている場合 939 939 if(!SetProjectToRun()) return; 940 940 941 941 //デバッグ用のコマンドライン及び実行可能ファイル(DLLのみ) 942 sprintf(temporary,"%s\r\n%s", ProjectInfo.szExePath,ProjectInfo.szCmdLine);942 sprintf(temporary,"%s\r\n%s",projectInfo.szExePath,projectInfo.szCmdLine); 943 943 sprintf(temp2,"%spgm.tmp",pj_editor_Dir); 944 944 HANDLE hFile=CreateFile(temp2,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL); … … 948 948 949 949 //ソースファイル名をtemp2へ 950 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);950 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2); 951 951 952 952 //出力ファイル名をtemp3へ 953 lstrcpy(temp3, ProjectInfo.lpszOutput_Debug);954 GetFullPath(temp3, ProjectInfo.dir);953 lstrcpy(temp3,projectInfo.lpszOutput_Debug); 954 GetFullPath(temp3,projectInfo.dir); 955 955 956 956 if(IsNeedCompileForProject(1)) … … 960 960 961 961 // DLLオプション 962 if( ProjectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");962 if(projectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll"); 963 963 964 964 // SLLオプション 965 if( ProjectInfo.dwModuleType == MT_SLL ) lstrcat( temporary, " /static_library" );965 if( projectInfo.dwModuleType == MT_SLL ) lstrcat( temporary, " /static_library" ); 966 966 967 967 //Unicodeオプション 968 if( ProjectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");968 if(projectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode"); 969 969 970 970 //ブレークポイントをセーブ 971 ProjectInfo.pobj_DBBreakPoint->SaveToTempFile();971 projectInfo.pobj_DBBreakPoint->SaveToTempFile(); 972 972 } 973 973 else{ … … 1015 1015 1016 1016 HWND hChild=::GetWindow(hClient,GW_CHILD); 1017 if( ProjectInfo.name[0]){1017 if(projectInfo.name[0]){ 1018 1018 //プロジェクトが開かれている場合 1019 1019 if(!SetProjectToRun()) return; 1020 1020 1021 1021 //ソースファイル名をtemp2へ 1022 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);1022 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2); 1023 1023 1024 1024 //出力ファイル名をtemp3へ 1025 lstrcpy(temp3, ProjectInfo.lpszOutput_Debug);1026 GetFullPath(temp3, ProjectInfo.dir);1025 lstrcpy(temp3,projectInfo.lpszOutput_Debug); 1026 GetFullPath(temp3,projectInfo.dir); 1027 1027 1028 1028 sprintf(temporary,"\"%s\" \"%s\" /debug /wnd:%08x",temp2,temp3,m_hWnd); 1029 1029 1030 1030 //DLLオプション 1031 if( ProjectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");1031 if(projectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll"); 1032 1032 1033 1033 //Unicodeオプション 1034 if( ProjectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");1034 if(projectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode"); 1035 1035 } 1036 1036 else{ … … 1126 1126 1127 1127 HWND hChild=::GetWindow(hClient,GW_CHILD); 1128 if( ProjectInfo.name[0]){1128 if(projectInfo.name[0]){ 1129 1129 //プロジェクトが開かれている場合 1130 1130 if(!SetProjectToRun()) return; 1131 1131 1132 1132 //ソースファイル名をtemp2へ 1133 ProjectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2);1133 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[0]->GetFullPath(temp2); 1134 1134 1135 1135 //出力ファイル名をtemp3へ 1136 lstrcpy(temp3, ProjectInfo.lpszOutput_Release);1137 GetFullPath(temp3, ProjectInfo.dir);1136 lstrcpy(temp3,projectInfo.lpszOutput_Release); 1137 GetFullPath(temp3,projectInfo.dir); 1138 1138 1139 1139 sprintf(temporary,"\"%s\" \"%s\" /wnd:%08x",temp2,temp3,m_hWnd); 1140 1140 1141 1141 //DLLオプション 1142 if( ProjectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll");1142 if(projectInfo.dwModuleType==MT_DLL) lstrcat(temporary," /dll"); 1143 1143 1144 1144 //Unicodeオプション 1145 if( ProjectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode");1145 if(projectInfo.dwOption & PJ_OP_UNICODE) lstrcat(temporary," /unicode"); 1146 1146 } 1147 1147 else{ … … 1182 1182 1183 1183 HWND hChild=::GetWindow(hClient,GW_CHILD); 1184 if( ProjectInfo.name[0]){1184 if(projectInfo.name[0]){ 1185 1185 /* //プロジェクトが開かれている場合 1186 1186 if(!SetProjectToRun()) return; … … 1190 1190 SendMessage(WM_COMMAND,IDM_RELEASECOMPILE,0);*/ 1191 1191 1192 if( ProjectInfo.dwModuleType==MT_DLL){1193 lstrcpy(temporary, ProjectInfo.szExePath);1192 if(projectInfo.dwModuleType==MT_DLL){ 1193 lstrcpy(temporary,projectInfo.szExePath); 1194 1194 } 1195 1195 else{ 1196 lstrcpy(temporary, ProjectInfo.lpszOutput_Debug);1197 GetFullPath(temporary, ProjectInfo.dir);1196 lstrcpy(temporary,projectInfo.lpszOutput_Debug); 1197 GetFullPath(temporary,projectInfo.dir); 1198 1198 } 1199 1199 } … … 1236 1236 void MainFrame::OnCmdBreakPoint( UINT uNotifyCode, int nID, CWindow wndCtl ) 1237 1237 { 1238 if( ProjectInfo.name[0]){1239 ProjectInfo.pobj_DBBreakPoint->Event_BreakPoint();1238 if(projectInfo.name[0]){ 1239 projectInfo.pobj_DBBreakPoint->Event_BreakPoint(); 1240 1240 } 1241 1241 else{
Note:
See TracChangeset
for help on using the changeset viewer.