Changeset 828 in dev for trunk/ab5.0/abdev/abdev/IconEditor_Tool.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/abdev/IconEditor_Tool.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/abdev/IconEditor_Tool.cpp

@@ -55 +55 @@
 
             hToolBar=CreateToolbarEx(hwnd,WS_CHILD|WS_VISIBLE|CCS_NODIVIDER|TBSTYLE_FLAT|TBSTYLE_TOOLTIPS,
-                NULL,
+                0,
                 BMPNUM_ICONTOOLBAR, /*ビットマップの個数*/
-                hResInst,(unsigned int)MAKEINTRESOURCE(IDR_ICONTOOLBAR),IconToolBar,
+                nullptr,
+                reinterpret_cast<UINT_PTR>(ActiveBasic::Resource::LoadBitmapAlt(hResInst, IDR_ICONTOOLBAR)),
+                IconToolBar,
                 BMPNUM_ICONTOOLBAR, /*アイテムの個数*/
                 0,0,16,15,sizeof(TBBUTTON));
@@ -188 +190 @@
             switch(LOWORD(wParam)){
                 case IDC_ADD_ICONTYPE:
-                    i=DialogBox(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_ICONTYPE),GetParent(hwnd),DlgIconType);
+                    i = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ICONEDIT_ICONTYPE, GetParent(hwnd), DlgIconType);
                     if(i==-1) return 1;