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

trunk/ab5.0/abdev/abdev/Resource.cpp

@@ -14 +14 @@
 void Project_CursorResInsert(void){
     extern HANDLE hHeap;
-    extern LPSTR CursorFileFilter;
+    extern const LPCSTR CursorFileFilter;
     int i3;
     char temporary[MAX_PATH];
@@ -79 +79 @@
     TVITEM tvItem;
 
-    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)projectInfo.resourceManager.cursorResources[CursorInfoNum].idName.c_str())) return;
+    if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_ResourceID_Input, reinterpret_cast<LPARAM>(projectInfo.resourceManager.cursorResources[CursorInfoNum].idName.c_str())))
+    {
+        return;
+    }
 
     //重複チェック
@@ -111 +114 @@
 void Project_BitmapResInsert(void){
     extern HANDLE hHeap;
-    extern LPSTR BitmapFileFilter;
+    extern const LPCSTR BitmapFileFilter;
     int i2,i3;
     char temporary[MAX_PATH];
@@ -186 +189 @@
     TVITEM tvItem;
 
-    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)projectInfo.resourceManager.bitmapResources[BitmapInfoNum].idName.c_str())) return;
+    if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_ResourceID_Input, reinterpret_cast<LPARAM>(projectInfo.resourceManager.bitmapResources[BitmapInfoNum].idName.c_str())))
+    {
+        return;
+    }
 
     //重複チェック
@@ -217 +223 @@
 void Project_IconResInsert(void){
     extern HANDLE hHeap;
-    extern LPSTR IconFileFilter;
+    extern const LPCSTR IconFileFilter;
     int i2,i3;
     char temporary[MAX_PATH];
@@ -317 +323 @@
     TVITEM tvItem;
 
-    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)projectInfo.resourceManager.iconResources[IconInfoNum].idName.c_str())) return;
+    if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_ResourceID_Input, reinterpret_cast<LPARAM>(projectInfo.resourceManager.iconResources[IconInfoNum].idName.c_str())))
+    {
+        return;
+    }
 
     //重複チェック