Changeset 624 in dev for trunk/ab5.0/abdev/abdev/ProjectControl.cpp
- Timestamp:
- May 23, 2008, 10:35:36 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/abdev/ProjectControl.cpp
r623 r624 191 191 } 192 192 } 193 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 194 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 193 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 194 { 195 if( resourceItem.hTreeItem == hTreeItem ) 196 { 195 197 NewIconEditWindow( 196 projectInfo.GetWorkDir().GetFullPath( projectInfo.resourceManager.iconResources[i].filepath ).c_str()198 projectInfo.GetWorkDir().GetFullPath( resourceItem.filepath ).c_str() 197 199 ); 198 200 break; … … 202 204 case IDM_MATERIALTREE_DELETE: 203 205 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 204 for(i=0;i< projectInfo.resourceManager.cursorResources.size();i++){206 for(i=0;i<static_cast<int>(projectInfo.resourceManager.cursorResources.size());i++){ 205 207 if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){ 206 208 … … 213 215 } 214 216 } 215 for(i=0;i< projectInfo.resourceManager.bitmapResources.size();i++){217 for(i=0;i<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i++){ 216 218 if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){ 217 219 … … 224 226 } 225 227 } 226 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){228 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 227 229 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 228 230 … … 261 263 extern char NewIdName[MAX_PATH]; 262 264 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 263 for(i=0;i< projectInfo.resourceManager.cursorResources.size();i++){265 for(i=0;i<static_cast<int>(projectInfo.resourceManager.cursorResources.size());i++){ 264 266 if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){ 265 267 Project_Cursor_RenameID(i); … … 267 269 } 268 270 } 269 for(i=0;i< projectInfo.resourceManager.bitmapResources.size();i++){271 for(i=0;i<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i++){ 270 272 if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){ 271 273 Project_Bitmap_RenameID(i); … … 273 275 } 274 276 } 275 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){277 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 276 278 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 277 279 Project_Icon_RenameID(i); … … 314 316 case IDM_MATERIALTREE_ICON_SETMAIN: 315 317 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 316 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){318 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 317 319 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 318 320 if(i==0) break; … … 1052 1054 // ウィンドウ定義ファイル(*.wnd)を作成 1053 1055 ///////////////////////////////////////// 1054 WindowInfos windowInfos;1055 windowInfos.push_back( new WindowInfo() );1056 ActiveBasic::PM::WindowInfos windowInfos; 1057 windowInfos.push_back( new ActiveBasic::PM::WindowInfo() ); 1056 1058 windowInfos.back()->SetName( "MainWnd" ); 1057 1059 windowInfos.back()->SetHandleName( "hMainWnd" ); … … 1060 1062 windowInfos.back()->size.cx=480; 1061 1063 windowInfos.back()->size.cy=360; 1062 windowInfos.back()-> caption=NewProjectInfo.name;1064 windowInfos.back()->SetCaption( NewProjectInfo.name ); 1063 1065 if(NewProjectInfo.dwTypeID==IDC_EXE_WINDOWBASE) 1064 windowInfos.back()->style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_VISIBLE; 1066 { 1067 windowInfos.back()->SetStyle( WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_VISIBLE ); 1068 } 1065 1069 else if(NewProjectInfo.dwTypeID==IDC_EXE_DIRECTX) 1066 windowInfos.back()->style=WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU; 1067 windowInfos.back()->ExStyle=0; 1068 windowInfos.back()->MenuID=0; 1069 windowInfos.back()->id=0; 1070 windowInfos.back()->bgColor=COLOR_3DFACE; 1070 { 1071 windowInfos.back()->SetStyle( WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU ); 1072 } 1073 windowInfos.back()->SetExStyle( 0 ); 1074 windowInfos.back()->SetMenuIdName( "" ); 1075 windowInfos.back()->SetBackgroundColor( COLOR_3DFACE ); 1071 1076 GetDefaultWindowFont(&windowInfos.back()->LogFont); 1072 windowInfos.back()-> IconResName=0;1073 windowInfos.back()-> ClassName="NORMAL";1077 windowInfos.back()->SetIconResourceName( "" ); 1078 windowInfos.back()->SetClassName( "NORMAL" ); 1074 1079 windowInfos.back()->CallBackName="MainWndProc"; 1075 1080 windowInfos.back()->type=WNDTYPE_DEFAULT; … … 1142 1147 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1143 1148 hCursorTreeItemForProjectView = tv.hParent; 1144 for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){ 1149 BOOST_FOREACH( ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.cursorResources ) 1150 { 1145 1151 tv.item.iImage=6; 1146 1152 tv.item.iSelectedImage=6; 1147 lstrcpy( temporary, projectInfo.resourceManager.cursorResources[i].idName.c_str() );1153 lstrcpy( temporary, resourceItem.idName.c_str() ); 1148 1154 tv.item.pszText=temporary; 1149 projectInfo.resourceManager.cursorResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1155 resourceItem.hTreeItem = TreeView_InsertItem(hMaterialTreeView,&tv); 1150 1156 } 1151 1157 … … 1158 1164 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1159 1165 hBitmapTreeItemForProjectView = tv.hParent; 1160 for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){ 1166 BOOST_FOREACH( ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 1167 { 1161 1168 tv.item.iImage=5; 1162 1169 tv.item.iSelectedImage=5; 1163 lstrcpy( temporary, projectInfo.resourceManager.bitmapResources[i].idName.c_str() );1170 lstrcpy( temporary, resourceItem.idName.c_str() ); 1164 1171 tv.item.pszText=temporary; 1165 projectInfo.resourceManager.bitmapResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1172 resourceItem.hTreeItem = TreeView_InsertItem(hMaterialTreeView,&tv); 1166 1173 } 1167 1174 … … 1174 1181 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1175 1182 hIconTreeItemForProjectView = tv.hParent; 1176 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){1183 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 1177 1184 tv.item.iImage=4; 1178 1185 tv.item.iSelectedImage=4; … … 1209 1216 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1210 1217 projectInfo.hWindowTreeItem=tv.hParent; 1211 BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )1218 BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos ) 1212 1219 { 1213 1220 tv.item.iImage=2; … … 1356 1363 } 1357 1364 } 1358 else if(lstrcmpi(temporary,"icon")==0){ 1359 for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){ 1360 if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){ 1365 else if(lstrcmpi(temporary,"icon")==0) 1366 { 1367 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1368 { 1369 if(lstrcmpi(resourceItem.filepath.c_str(),temp2)==0){ 1361 1370 NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() ); 1362 1371 break; … … 1478 1487 } 1479 1488 else if(lstrcmpi(temporary,"icon")==0){ 1480 for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){ 1481 if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){ 1489 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1490 { 1491 if(lstrcmpi(resourceItem.filepath.c_str(),temp2)==0){ 1482 1492 NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() ); 1483 1493 break; … … 1597 1607 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1598 1608 if(MdiInfo[WndNum].MdiIconEditInfo->bModify){ 1599 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 1600 lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str()); 1609 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1610 { 1611 lstrcpy(temporary,resourceItem.filepath.c_str()); 1601 1612 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); 1602 1613 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1; … … 1671 1682 } 1672 1683 else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){ 1673 BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )1684 BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos ) 1674 1685 { 1675 1686 if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str())==0){ … … 1690 1701 } 1691 1702 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1692 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 1693 lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str()); 1703 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1704 { 1705 lstrcpy(temporary,resourceItem.filepath.c_str()); 1694 1706 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); 1695 1707 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 1696 sprintf(buffer+i2,"icon,%s\r\n", projectInfo.resourceManager.iconResources[i].filepath.c_str());1708 sprintf(buffer+i2,"icon,%s\r\n",resourceItem.filepath.c_str()); 1697 1709 i2+=lstrlen(buffer+i2); 1698 1710 break;
Note:
See TracChangeset
for help on using the changeset viewer.