- Timestamp:
- Jan 30, 2011, 6:15:50 PM (14 years ago)
- Location:
- branches/egtra/ab5.0/abdev
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp
r791 r792 134 134 ACCEL AccelFromEntry(ACCELTABLEENTRY const& e) 135 135 { 136 ACCEL t = { e.fFlags & 0x7f, e.wAnsi, e.wId};136 ACCEL t = {static_cast<BYTE>(e.fFlags & 0x7f), e.wAnsi, e.wId}; 137 137 return t; 138 138 } … … 161 161 } 162 162 163 HMENU LoadMenu(HINSTANCE hinst, USHORT id) 164 { 165 return LoadMenuIndirect(GetResource(hinst, id, RT_MENU)); 166 } 167 163 168 }} 164 169 -
branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.h
r791 r792 16 16 HACCEL LoadAccelerators(HINSTANCE hinst, USHORT id); 17 17 18 HMENU LoadMenu(HINSTANCE hinst, USHORT id); 19 18 20 struct IconDeleter 19 21 { -
branches/egtra/ab5.0/abdev/abdev/SubOperation.cpp
r786 r792 846 846 847 847 //メインメニュー 848 pobj_MainMenu=new CMenuEx( LoadMenu(hResInst,MAKEINTRESOURCE(IDR_MAINMENU)));848 pobj_MainMenu=new CMenuEx(ActiveBasic::Resource::LoadMenu(hResInst, IDR_MAINMENU)); 849 849 850 850 pobj_MainMenu->InitOwnerDraw(1); //オーナー描画の初期化 … … 958 958 959 959 extern HMENU hRebarMenuBase,hRebarMenu; 960 hRebarMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_REBARMENU));960 hRebarMenuBase = ActiveBasic::Resource::LoadMenu(hResInst, IDR_REBARMENU); 961 961 hRebarMenu=GetSubMenu(hRebarMenuBase,0); 962 962 963 963 extern HMENU hTabMenuBase,hTabMenu,hTabColorMenu; 964 hTabMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_TABMENU));964 hTabMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_TABMENU); 965 965 hTabMenu=GetSubMenu(hTabMenuBase,0); 966 966 hTabColorMenu=GetSubMenu(hTabMenu,0); 967 967 968 968 extern HMENU hFileTreeMenuBase; 969 hFileTreeMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_FILETREEMENU));969 hFileTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_FILETREEMENU); 970 970 971 971 extern HMENU hProcedureTreeMenuBase; 972 hProcedureTreeMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_PROCEDURETREEMENU));972 hProcedureTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_PROCEDURETREEMENU); 973 973 974 974 extern HMENU hMaterialTreeMenuBase; 975 hMaterialTreeMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_MATERIALTREEMENU));975 hMaterialTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_MATERIALTREEMENU); 976 976 977 977 extern HMENU hRadMenuBase; 978 hRadMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_RADCONTEXTMENU));978 hRadMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_RADCONTEXTMENU); 979 979 980 980 //クリップボードのデータ形式(RAD用)を新規登録
Note:
See TracChangeset
for help on using the changeset viewer.