Changeset 828 in dev for trunk/ab5.0/abdev/abdev/MenuProc.cpp
- Timestamp:
- Mar 19, 2012, 1:59:48 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to
/branches/egtra merged eligible
-
Property svn:mergeinfo
set to
-
trunk/ab5.0/abdev
-
Property svn:ignore
set to
*.opensdf
*.sdf
*.suo
*.user
int
ipch
out
-
Property svn:ignore
set to
-
trunk/ab5.0/abdev/abdev/MenuProc.cpp
r772 r828 73 73 MENU_INFO *MenuInfo; 74 74 75 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_MenuID_Input,0)) return; 75 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_MenuID_Input)) 76 { 77 return; 78 } 76 79 77 80 //重複チェック … … 265 268 266 269 MdiInfo[i]->MdiMenuInfo->hMenuEdit=hMenuEdit; 267 MdiInfo[i]->MdiMenuInfo->hEdit_Dlg =CreateDialog(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENUEDIT),hMenuEdit,(DLGPROC)MenuEditDlg);270 MdiInfo[i]->MdiMenuInfo->hEdit_Dlg = ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_PROJECT_MENUEDIT, hMenuEdit, MenuEditDlg); 268 271 269 272 SCROLLINFO ScrollInfo; … … 406 409 pMenuInfo=&pMenuInfo->pMenuInfo[i2]; 407 410 408 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENURENAME),hOwner,(DLGPROC)DlgMenuProperty_Rename,(long)pMenuInfo)) return 1; 411 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PROJECT_MENURENAME, hOwner, DlgMenuProperty_Rename, reinterpret_cast<LPARAM>(pMenuInfo))) 412 { 413 return 1; 414 } 409 415 GetDlgItemText(hwnd,IDC_IDNAME,temporary,MAX_PATH); 410 416
Note:
See TracChangeset
for help on using the changeset viewer.