Changeset 793 in dev for branches/egtra/ab5.0/abdev/abdev/SubOperation.cpp

Timestamp:

Jan 30, 2011, 6:29:32 PM (13 years ago)

Author:

イグトランス (egtra)

Message:

代替のリソース読み込み関数の名称を変更（WinAPIとかぶらないものへ）

File:

• branches/egtra/ab5.0/abdev/abdev/SubOperation.cpp (modified) (4 diffs)

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

@@ -838 +838 @@
     extern HICON hOwnerIcon,hBasicProgramIcon,hTextDocumentIcon,hWindowDocumentIcon;
     hOwnerIcon=(HICON)LoadImage(hInst,MAKEINTRESOURCE(IDI_MAIN),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);
-    hBasicProgramIcon=ActiveBasic::Resource::LoadIcon(hResInst, IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
-    hTextDocumentIcon=ActiveBasic::Resource::LoadIcon(hResInst,IDI_TEXTDOCUMENT,16,16,LR_DEFAULTCOLOR);
-    hWindowDocumentIcon=ActiveBasic::Resource::LoadIcon(hResInst,IDI_WINDOW,16,16,LR_DEFAULTCOLOR);
+    hBasicProgramIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
+    hTextDocumentIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT, 16, 16, LR_DEFAULTCOLOR);
+    hWindowDocumentIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_WINDOW, 16, 16, LR_DEFAULTCOLOR);
 
 
@@ -846 +846 @@
 
     //メインメニュー
-    pobj_MainMenu=new CMenuEx(ActiveBasic::Resource::LoadMenu(hResInst, IDR_MAINMENU));
+    pobj_MainMenu=new CMenuEx(ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_MAINMENU));
 
     pobj_MainMenu->InitOwnerDraw(1);            //オーナー描画の初期化
@@ -880 +880 @@
     }
 
-#define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon((itemID), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16));
+#define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon((itemID), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16));
     //メニューアイコンをセット
 
@@ -954 +954 @@
 
     extern HMENU hEditMenuBase,hEditMenu;
-    hEditMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_EDITMENU));
+    hEditMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_EDITMENU);
     hEditMenu=GetSubMenu(hEditMenuBase,0);
 
     extern HMENU hRebarMenuBase,hRebarMenu;
-    hRebarMenuBase = ActiveBasic::Resource::LoadMenu(hResInst, IDR_REBARMENU);
+    hRebarMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_REBARMENU);
     hRebarMenu=GetSubMenu(hRebarMenuBase,0);
 
     extern HMENU hTabMenuBase,hTabMenu,hTabColorMenu;
-    hTabMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_TABMENU);
+    hTabMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_TABMENU);
     hTabMenu=GetSubMenu(hTabMenuBase,0);
     hTabColorMenu=GetSubMenu(hTabMenu,0);
 
     extern HMENU hFileTreeMenuBase;
-    hFileTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_FILETREEMENU);
+    hFileTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_FILETREEMENU);
 
     extern HMENU hProcedureTreeMenuBase;
-    hProcedureTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_PROCEDURETREEMENU);
+    hProcedureTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_PROCEDURETREEMENU);
 
     extern HMENU hMaterialTreeMenuBase;
-    hMaterialTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_MATERIALTREEMENU);
+    hMaterialTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_MATERIALTREEMENU);
 
     extern HMENU hRadMenuBase;
-    hRadMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_RADCONTEXTMENU);
+    hRadMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_RADCONTEXTMENU);
 
     //クリップボードのデータ形式（RAD用）を新規登録