Changeset 625 in dev for trunk/ab5.0/abdev/abdev/src/MainFrame.cpp
- Timestamp:
- May 27, 2008, 9:17:34 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/abdev/src/MainFrame.cpp
r624 r625 316 316 mii.dwTypeData=temporary; 317 317 mii.fType=MFT_STRING; 318 if( MdiInfo[WndNum].path[0]){319 _splitpath(MdiInfo[WndNum].path ,NULL,NULL,temporary,temp2);318 if(!MdiInfo[WndNum].path.empty()){ 319 _splitpath(MdiInfo[WndNum].path.c_str(),NULL,NULL,temporary,temp2); 320 320 lstrcat(temporary,temp2); 321 321 lstrcat(temporary," を保存(&S)"); … … 329 329 /*「絶対パスをコピー」「フォルダを開く」「ファイルを削除」 330 330 コマンドを場合によって無効化にする */ 331 if( MdiInfo[WndNum].path[0]){331 if(!MdiInfo[WndNum].path.empty()){ 332 332 EnableMenuItem(hTabMenu,IDM_PATH_COPY,MF_BYCOMMAND|MF_ENABLED); 333 333 EnableMenuItem(hTabMenu,IDM_FOLDER_OPEN,MF_BYCOMMAND|MF_ENABLED); … … 383 383 WndNum=GetWndNum(hChild); 384 384 if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){ 385 if(lstrcmpi(MdiInfo[WndNum].path ,temporary)==0) break;385 if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) break; 386 386 } 387 387 hChild=::GetNextWindow(hChild,GW_HWNDNEXT); … … 548 548 void MainFrame::OnCmdAllSave( UINT uNotifyCode, int nID, CWindow wndCtl ) 549 549 { 550 for( int i=0;i<M AX_WNDNUM;i++){550 for( int i=0;i<MdiInfo.size();i++){ 551 551 if(MdiInfo[i].hwnd) SaveDocument(MdiInfo[i].hwnd,NULL); 552 552 } … … 585 585 if(!hChild) return; 586 586 int WndNum=GetWndNum(hChild); 587 if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)) 587 if( IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType) ) 588 { 588 589 TextEdit_UndoCommand(WndNum); 589 else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD) 590 } 591 else if( MdiInfo[WndNum].DocType == WNDTYPE_RAD ) 592 { 590 593 Rad_UndoCommand(WndNum); 591 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT) 594 } 595 else if( MdiInfo[WndNum].DocType == WNDTYPE_ICONEDIT ) 596 { 592 597 IconEdit_UndoCommand(WndNum); 598 } 593 599 } 594 600 … … 986 992 if(!SetRunning(hChild)) return; 987 993 if(IsNeedCompile(MdiInfo[GetWndNum(hChild)].path,1)) 988 sprintf(temporary,"\"%s\" /debug /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path ,m_hWnd);994 sprintf(temporary,"\"%s\" /debug /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd); 989 995 else 990 sprintf(temporary,"\"%s\" /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path ,m_hWnd);996 sprintf(temporary,"\"%s\" /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd); 991 997 992 998 //ブレークポイントをセーブ … … 1051 1057 //単独ソースコード 1052 1058 if(!SetRunning(hChild)) return; 1053 sprintf(temporary,"\"%s\" /debug /wnd:%08x",MdiInfo[GetWndNum(hChild)].path ,m_hWnd);1059 sprintf(temporary,"\"%s\" /debug /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd); 1054 1060 } 1055 1061 … … 1165 1171 //単独ソースコード 1166 1172 if(!SetRunning(hChild)) return; 1167 sprintf(temporary,"\"%s\" /wnd:%08x",MdiInfo[GetWndNum(hChild)].path ,m_hWnd);1173 sprintf(temporary,"\"%s\" /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd); 1168 1174 } 1169 1175 … … 1224 1230 1225 1231 //単独ソースコード 1226 _splitpath(MdiInfo[GetWndNum(hChild)].path ,temporary,temp2,temp3,NULL);1232 _splitpath(MdiInfo[GetWndNum(hChild)].path.c_str(),temporary,temp2,temp3,NULL); 1227 1233 lstrcat(temporary,temp2); 1228 1234 lstrcat(temporary,temp3); … … 1403 1409 HWND hChild=::GetWindow(hClient,GW_CHILD); 1404 1410 int WndNum=GetWndNum(hChild); 1405 for(int i=0;i<M AX_WNDNUM;i++){1411 for(int i=0;i<MdiInfo.size();i++){ 1406 1412 if(i==WndNum) continue; 1407 1413 if(MdiInfo[i].hwnd) SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0); … … 1415 1421 1416 1422 //絶対パスをコピー 1417 HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE, lstrlen(MdiInfo[WndNum].path)+1);1423 HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE,MdiInfo[WndNum].path.size()+1); 1418 1424 char *pTemp=(char *)GlobalLock(hGlobal); 1419 lstrcpy(pTemp,MdiInfo[WndNum].path );1425 lstrcpy(pTemp,MdiInfo[WndNum].path.c_str()); 1420 1426 GlobalUnlock(hGlobal); 1421 1427 … … 1433 1439 1434 1440 char temporary[1024], temp2[1024]; 1435 _splitpath(MdiInfo[WndNum].path ,temporary,temp2,NULL,NULL);1441 _splitpath(MdiInfo[WndNum].path.c_str(),temporary,temp2,NULL,NULL); 1436 1442 lstrcat(temporary,temp2); 1437 1443 … … 1445 1451 1446 1452 char temporary[1024], temp2[1024]; 1447 _splitpath(MdiInfo[WndNum].path ,NULL,NULL,temporary,temp2);1453 _splitpath(MdiInfo[WndNum].path.c_str(),NULL,NULL,temporary,temp2); 1448 1454 lstrcat(temporary,temp2); 1449 1455 … … 1455 1461 fo.hwnd=m_hWnd; 1456 1462 fo.wFunc=FO_DELETE; 1457 fo.pFrom =MdiInfo[WndNum].path ;1463 fo.pFrom =MdiInfo[WndNum].path.c_str(); 1458 1464 fo.pTo="\0"; 1459 1465 fo.fFlags =FOF_ALLOWUNDO|FOF_NOCONFIRMATION;
Note:
See TracChangeset
for help on using the changeset viewer.