Changeset 618 in dev for trunk/ab5.0/abdev/abdev/DrawWindow.cpp

Timestamp:

May 19, 2008, 5:10:15 PM (16 years ago)

Author:

dai_9181

Message:

・PROJECTINFO構造体を廃止し、Projectクラスを採用した。
・ProjectInfoをprojectInfoにリネーム

File:

• trunk/ab5.0/abdev/abdev/DrawWindow.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/abdev/DrawWindow.cpp

@@ -991 +991 @@
     else if(pWindowInfo->bgColor>=0x1000){
         //ビットマップ
-        for(i2=0;i2<ProjectInfo.res.NumberOfBitmapRes;i2++){
-            if(lstrcmp(ProjectInfo.res.pBitmapResInfo[pWindowInfo->bgColor-0x1000].IdName,
-                ProjectInfo.res.pBitmapResInfo[i2].IdName)==0) break;
-        }
-        if(i2!=ProjectInfo.res.NumberOfBitmapRes){
-            lstrcpy(temporary,ProjectInfo.res.pBitmapResInfo[i2].path);
-            GetFullPath(temporary,ProjectInfo.dir);
+        for(i2=0;i2<projectInfo.res.NumberOfBitmapRes;i2++){
+            if(lstrcmp(projectInfo.res.pBitmapResInfo[pWindowInfo->bgColor-0x1000].IdName,
+                projectInfo.res.pBitmapResInfo[i2].IdName)==0) break;
+        }
+        if(i2!=projectInfo.res.NumberOfBitmapRes){
+            lstrcpy(temporary,projectInfo.res.pBitmapResInfo[i2].path);
+            GetFullPath(temporary,projectInfo.dir);
             hImage=LoadImage(NULL,temporary,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE);
 
@@ -1358 +1358 @@
                     lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path);
                 else{
-                    for(i2=0;i2<ProjectInfo.res.NumberOfIconRes;i2++){
+                    for(i2=0;i2<projectInfo.res.NumberOfIconRes;i2++){
                         if(lstrcmp(pChildInfo->ImageCtrlInfo.path,
-                            ProjectInfo.res.pIconResInfo[i2].IdName)==0) break;
+                            projectInfo.res.pIconResInfo[i2].IdName)==0) break;
                     }
-                    if(i2==ProjectInfo.res.NumberOfIconRes) goto NonIconImage;
-
-                    lstrcpy(temporary,ProjectInfo.res.pIconResInfo[i2].path);
-                }
-                GetFullPath(temporary,ProjectInfo.dir);
+                    if(i2==projectInfo.res.NumberOfIconRes) goto NonIconImage;
+
+                    lstrcpy(temporary,projectInfo.res.pIconResInfo[i2].path);
+                }
+                GetFullPath(temporary,projectInfo.dir);
                 hImage=LoadImage(NULL,temporary,IMAGE_ICON,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE);
                 if(hImage){
@@ -1402 +1402 @@
                     lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path);
                 else{
-                    for(i2=0;i2<ProjectInfo.res.NumberOfBitmapRes;i2++){
+                    for(i2=0;i2<projectInfo.res.NumberOfBitmapRes;i2++){
                         if(lstrcmp(pChildInfo->ImageCtrlInfo.path,
-                            ProjectInfo.res.pBitmapResInfo[i2].IdName)==0) break;
+                            projectInfo.res.pBitmapResInfo[i2].IdName)==0) break;
                     }
-                    if(i2==ProjectInfo.res.NumberOfBitmapRes) goto NonBitmapImage;
-
-                    lstrcpy(temporary,ProjectInfo.res.pBitmapResInfo[i2].path);
-                }
-                GetFullPath(temporary,ProjectInfo.dir);
+                    if(i2==projectInfo.res.NumberOfBitmapRes) goto NonBitmapImage;
+
+                    lstrcpy(temporary,projectInfo.res.pBitmapResInfo[i2].path);
+                }
+                GetFullPath(temporary,projectInfo.dir);
                 hImage=LoadImage(NULL,temporary,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE);
                 if(hImage){