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

Timestamp:

Jan 29, 2011, 6:17:56 PM (13 years ago)

Author:

イグトランス (egtra)

Message:

icon_resをLOAD_LIBRARY_AS_DATAFILE付きで読み込むよう変更。icon_resプロジェクトをab.slnへ組み込んだ。

File:

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

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

@@ -692 +692 @@
     const std::string resDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\res.dll";
     hResInst = LoadLibrary( resDllPath.c_str() );
+    if(!hResInst){
+        MessageBox(0,"res.dllの読み込みに失敗しました。",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION);
+        return 0;
+    }
 
     //アイコンリソースDLLをマッピング
     const std::string iconResDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\icon_res.dll";
-    hIconResInst = LoadLibrary( iconResDllPath.c_str() );
+    hIconResInst = LoadLibraryEx( iconResDllPath.c_str(), nullptr, LOAD_LIBRARY_AS_DATAFILE );
+    if(!hIconResInst){
+        MessageBox(0,"icon_res.dllの読み込みに失敗しました。",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION);
+        return 0;
+    }
 
     //LuxCtrl.dllをマッピング
@@ -872 +880 @@
     }
 
-#define ICONSET(itemID,iconID) pobj_MainMenu->SetIcon(itemID,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0));
+#define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon((itemID), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16));
     //メニューアイコンをセット