Changeset 828 in dev for trunk/ab5.0/abdev/abdev/ChildWndOnRebar.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/ChildWndOnRebar.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/abdev/ChildWndOnRebar.cpp

@@ -229 +229 @@
 
 
-#define ADD_TOOLBAR_BUTTON(id,iconID,lpszToolTip) pobj_StandardToolbar->Add(id,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)
+#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_StandardToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip))
 #define ADD_TOOLBAR_SEPARATOR pobj_StandardToolbar->Add(0,0,0)
     //ボタン類を追加
@@ -279 +279 @@
     pobj_DebuggerToolbar->Create(hDebuggerToolbarPager);
 
-#define ADD_TOOLBAR_BUTTON(id,iconID,lpszToolTip) pobj_DebuggerToolbar->Add(id,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)
+#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_DebuggerToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip))
 #define ADD_TOOLBAR_SEPARATOR pobj_DebuggerToolbar->Add(0,0,0)
     //ボタン類を追加
@@ -327 +327 @@
     pobj_ReleaseToolbar->Create(hReleaseToolbarPager);
 
-#define ADD_TOOLBAR_BUTTON(id,iconID,lpszToolTip) pobj_ReleaseToolbar->Add(id,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)
+#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_ReleaseToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip))
 #define ADD_TOOLBAR_SEPARATOR pobj_ReleaseToolbar->Add(0,0,0)
     //ボタン類を追加