Changeset 795 in dev for branches/egtra

Timestamp:

Jan 31, 2011, 12:18:33 AM (14 years ago)

Author:

イグトランス (egtra)

Message:

LoadBitmapの代替関数を実装

Location:

branches/egtra/ab5.0/abdev

Files:

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

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

@@ -5 +5 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/numeric/conversion/cast.hpp>
+#include <atlbase.h>
+#pragma warning(push)
+#pragma warning(disable: 6387)
+#include <atlapp.h>
+#include <atlgdi.h>
+#pragma warning(pop)
 #include <Resource/Load.h>
 
@@ -182 +188 @@
 }
 
+HBITMAP LoadBitmapAlt(HINSTANCE hinst, USHORT id)
+{
+    WTL::CDC dc = ::GetDC(nullptr);
+    auto pbi = static_cast<BITMAPINFO const*>(GetResource(hinst, id, RT_BITMAP));
+    return CreateDIBitmap(dc, &pbi->bmiHeader, CBM_INIT, reinterpret_cast<BYTE const*>(pbi) + pbi->bmiHeader.biSize, pbi, DIB_RGB_COLORS);
+}
+
 }}

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

@@ -21 +21 @@
 HWND CreateDialogAlt(HINSTANCE hinst, USHORT id, HWND hwndParent, DLGPROC dialogFunc, LPARAM initParam = 0);
 
+HBITMAP LoadBitmapAlt(HINSTANCE hinst, USHORT id);
+
 struct IconDeleter
 {

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

@@ -1096 +1096 @@
             HBITMAP hBmp,hOldBmp;
             HDC memdc;
-            hBmp=(HBITMAP)LoadImage(hResInst,MAKEINTRESOURCE(IDB_PARAMHINT_QUESTION),IMAGE_BITMAP,0,0,LR_DEFAULTSIZE);
+            hBmp = ActiveBasic::Resource::LoadBitmapAlt(hResInst, IDB_PARAMHINT_QUESTION);
             memdc=CreateCompatibleDC(hdc);
             hOldBmp=(HBITMAP)SelectObject(memdc,hBmp);
@@ -1119 +1119 @@
                 hdc=GetDC(hwnd);
 
-                hBmp=(HBITMAP)LoadImage(hResInst,MAKEINTRESOURCE(IDB_PARAMHINT_QUESTION2),IMAGE_BITMAP,0,0,LR_DEFAULTSIZE);
+                hBmp = ActiveBasic::Resource::LoadBitmapAlt(hResInst,IDB_PARAMHINT_QUESTION2);
                 memdc=CreateCompatibleDC(hdc);
                 hOldBmp=(HBITMAP)SelectObject(memdc,hBmp);
@@ -1137 +1137 @@
                 hdc=GetDC(hwnd);
 
-                hBmp=(HBITMAP)LoadImage(hResInst,MAKEINTRESOURCE(IDB_PARAMHINT_QUESTION),IMAGE_BITMAP,0,0,LR_DEFAULTSIZE);
+                hBmp = ActiveBasic::Resource::LoadBitmapAlt(hResInst, IDB_PARAMHINT_QUESTION);
                 memdc=CreateCompatibleDC(hdc);
                 hOldBmp=(HBITMAP)SelectObject(memdc,hBmp);