Changeset 792 in dev

Timestamp:

Jan 30, 2011, 6:15:50 PM (13 years ago)

Author:

イグトランス (egtra)

Message:

LoadMenuの代替関数を実装

Location:

branches/egtra/ab5.0/abdev

Files:

• abdev-impl/Resource/Load.cpp (modified) (2 diffs)
• abdev-impl/Resource/Load.h (modified) (1 diff)
• abdev/SubOperation.cpp (modified) (2 diffs)

branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp

@@ -134 +134 @@
 ACCEL AccelFromEntry(ACCELTABLEENTRY const& e)
 {
-    ACCEL t = {e.fFlags & 0x7f, e.wAnsi, e.wId};
+    ACCEL t = {static_cast<BYTE>(e.fFlags & 0x7f), e.wAnsi, e.wId};
     return t;
 }
@@ -161 +161 @@
 }
 
+HMENU LoadMenu(HINSTANCE hinst, USHORT id)
+{
+    return LoadMenuIndirect(GetResource(hinst, id, RT_MENU));
+}
+
 }}
 

branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.h

@@ -16 +16 @@
 HACCEL LoadAccelerators(HINSTANCE hinst, USHORT id);
 
+HMENU LoadMenu(HINSTANCE hinst, USHORT id);
+
 struct IconDeleter
 {

branches/egtra/ab5.0/abdev/abdev/SubOperation.cpp

@@ -846 +846 @@
 
     //メインメニュー
-    pobj_MainMenu=new CMenuEx(LoadMenu(hResInst,MAKEINTRESOURCE(IDR_MAINMENU)));
+    pobj_MainMenu=new CMenuEx(ActiveBasic::Resource::LoadMenu(hResInst, IDR_MAINMENU));
 
     pobj_MainMenu->InitOwnerDraw(1);            //オーナー描画の初期化
@@ -958 +958 @@
 
     extern HMENU hRebarMenuBase,hRebarMenu;
-    hRebarMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_REBARMENU));
+    hRebarMenuBase = ActiveBasic::Resource::LoadMenu(hResInst, IDR_REBARMENU);
     hRebarMenu=GetSubMenu(hRebarMenuBase,0);
 
     extern HMENU hTabMenuBase,hTabMenu,hTabColorMenu;
-    hTabMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_TABMENU));
+    hTabMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_TABMENU);
     hTabMenu=GetSubMenu(hTabMenuBase,0);
     hTabColorMenu=GetSubMenu(hTabMenu,0);
 
     extern HMENU hFileTreeMenuBase;
-    hFileTreeMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_FILETREEMENU));
+    hFileTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_FILETREEMENU);
 
     extern HMENU hProcedureTreeMenuBase;
-    hProcedureTreeMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_PROCEDURETREEMENU));
+    hProcedureTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_PROCEDURETREEMENU);
 
     extern HMENU hMaterialTreeMenuBase;
-    hMaterialTreeMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_MATERIALTREEMENU));
+    hMaterialTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_MATERIALTREEMENU);
 
     extern HMENU hRadMenuBase;
-    hRadMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_RADCONTEXTMENU));
+    hRadMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_RADCONTEXTMENU);
 
     //クリップボードのデータ形式（RAD用）を新規登録