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

Timestamp:

May 21, 2008, 11:02:07 PM (16 years ago)

Author:

dai_9181

Message:

Projectクラスをリファクタリング

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);
+        for(i2=0;i2<projectInfo.resourceManager.bitmapResources.size();i2++){
+            if( projectInfo.resourceManager.bitmapResources[pWindowInfo->bgColor-0x1000].idName == projectInfo.resourceManager.bitmapResources[i2].idName )
+            {
+                break;
+            }
+        }
+        if(i2!=projectInfo.resourceManager.bitmapResources.size()){
+            lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i2].filepath.c_str());
             lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
             hImage=LoadImage(NULL,temporary,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE);
@@ -1358 +1360 @@
                     lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path);
                 else{
-                    for(i2=0;i2<projectInfo.res.NumberOfIconRes;i2++){
-                        if(lstrcmp(pChildInfo->ImageCtrlInfo.path,
-                            projectInfo.res.pIconResInfo[i2].IdName)==0) break;
+                    for(i2=0;i2<projectInfo.resourceManager.iconResources.size();i2++)
+                    {
+                        if( projectInfo.resourceManager.iconResources[i2].idName == pChildInfo->ImageCtrlInfo.path )
+                        {
+                            break;
+                        }
                     }
-                    if(i2==projectInfo.res.NumberOfIconRes) goto NonIconImage;
-
-                    lstrcpy(temporary,projectInfo.res.pIconResInfo[i2].path);
+                    if(i2==projectInfo.resourceManager.iconResources.size()) goto NonIconImage;
+
+                    lstrcpy(temporary,projectInfo.resourceManager.iconResources[i2].filepath.c_str());
                 }
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
@@ -1402 +1407 @@
                     lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path);
                 else{
-                    for(i2=0;i2<projectInfo.res.NumberOfBitmapRes;i2++){
-                        if(lstrcmp(pChildInfo->ImageCtrlInfo.path,
-                            projectInfo.res.pBitmapResInfo[i2].IdName)==0) break;
+                    for(i2=0;i2<projectInfo.resourceManager.bitmapResources.size();i2++){
+                        if( projectInfo.resourceManager.bitmapResources[i2].idName == pChildInfo->ImageCtrlInfo.path )
+                        {
+                            break;
+                        }
                     }
-                    if(i2==projectInfo.res.NumberOfBitmapRes) goto NonBitmapImage;
-
-                    lstrcpy(temporary,projectInfo.res.pBitmapResInfo[i2].path);
+                    if(i2==projectInfo.resourceManager.bitmapResources.size()) goto NonBitmapImage;
+
+                    lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i2].filepath.c_str());
                 }
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );