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

trunk/ab5.0/abdev/abdev/ExtensionLink.cpp

@@ -430 +430 @@
             switch(LOWORD(wParam)){
                 case IDC_ADD_BUTTON:
-                    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd,(DLGPROC)DlgFileLinkAdd,0)) return 1;
+                    if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_EXTENSION_ADD, hwnd, DlgFileLinkAdd))
+                    {
+                        return 1;
+                    }
 
                     pobj_nv->pobj_ExtLink->ResetListView(GetDlgItem(hwnd,IDC_EXTENSION_LIST));
@@ -445 +448 @@
                     if(i==ListView_GetItemCount(hListView)) return 1;
 
-                    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd,(DLGPROC)DlgFileLinkAdd,(LPARAM)pobj_nv->pobj_ExtLink->ppobj_ExtItems[i])) return 1;
+                    if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_EXTENSION_ADD, hwnd, DlgFileLinkAdd,(LPARAM)pobj_nv->pobj_ExtLink->ppobj_ExtItems[i]))
+                    {
+                        return 1;
+                    }
 
                     pobj_nv->pobj_ExtLink->ResetListView(GetDlgItem(hwnd,IDC_EXTENSION_LIST));
@@ -516 +522 @@
     pobj_nv->save();
 
-    if(DialogBox(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_LINK),hwnd,(DLGPROC)DlgLinkFile)==0) return;
+    if (ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_EXTENSION_LINK, hwnd, DlgLinkFile)==0)
+    {
+        return;
+    }
 
     char szApplicationPath[MAX_PATH];