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

trunk/ab5.0/abdev/abdev/FileTree.cpp

@@ -98 +98 @@
                 case IDM_FILETREE_INSERT:
                     //"プロジェクトへ挿入するファイルを指定して下さい"
-                    extern LPSTR DefFileFilter;
+                    extern const LPCSTR DefFileFilter;
                     if(!GetFilePathDialog(hOwner,temporary,DefFileFilter,STRING_FILEOPENTITLE_INSERTEDPROJECT,1)) break;
                     Project_File_Insert(temporary);
@@ -124 +124 @@
                     break;
                 case IDM_FILETREE_PROPERTY:
-                    DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_FILEPROPERTY),hOwner,(DLGPROC)DlgProject_FileProperty);
+                    ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PROJECT_FILEPROPERTY, hOwner, DlgProject_FileProperty);
                     break;
             }
@@ -160 +160 @@
     //イメージリスト読み込み、設定
     hImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,3,0);
-    ImageList_AddIcon(hImageList,LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_CLOSE)));
-    ImageList_AddIcon(hImageList,LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_OPEN)));
-    ImageList_AddIcon(hImageList,LoadIcon(hResInst,MAKEINTRESOURCE(IDI_TEXTDOCUMENT)));
+    ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_CLOSE));
+    ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_OPEN));
+    ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT));
     this->SetImageList(hImageList,TVSIL_NORMAL);
 }