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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp (modified) (5 diffs)

trunk/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp

@@ -564 +564 @@
                 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_BGCOLOR2);
 
-                for(i3=0;i3<projectInfo.res.NumberOfBitmapRes;i3++)
-                    SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)projectInfo.res.pBitmapResInfo[i3].IdName);
+                for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++)
+                    SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
                 if(pWindowInfo->type==WNDTYPE_MODALDLG||
                     pWindowInfo->type==WNDTYPE_MODELESSDLG){
@@ -617 +617 @@
                 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_ICONDEFAULT);
 
-                for(i3=0,i4=0;i3<projectInfo.res.NumberOfIconRes;i3++){
-                    SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(long)projectInfo.res.pIconResInfo[i3].IdName);
-
-                    if(lstrcmp(pWindowInfo->IconResName,projectInfo.res.pIconResInfo[i3].IdName)==0)
-                        i4=i3+1;
+                for(i3=0,i4=0;i3<projectInfo.resourceManager.iconResources.size();i3++){
+                    SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
+
+                    if( pWindowInfo->IconResName )
+                    {
+                        if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->IconResName )
+                        {
+                            i4=i3+1;
+                        }
+                    }
                 }
                 if(i4==0&&pWindowInfo->IconResName){
@@ -2727 +2732 @@
                         if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON){
                             //アイコンリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.res.NumberOfIconRes;i3++)
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.res.pIconResInfo[i3].IdName);
+                            for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++)
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
                         }
                         else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
                             //ビットマップリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.res.NumberOfBitmapRes;i3++)
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.res.pBitmapResInfo[i3].IdName);
+                            for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++)
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
                         }
 
@@ -2816 +2821 @@
                                     if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON){
                                         //アイコンリソースをコンボボックスに挿入
-                                        for(i3=0;i3<projectInfo.res.NumberOfIconRes;i3++){
-                                            SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.res.pIconResInfo[i3].IdName);
-
-                                            if(lstrcmp(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path,projectInfo.res.pIconResInfo[i3].IdName)==0)
+                                        for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){
+                                            SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
+
+                                            if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path )
+                                            {
                                                 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
+                                            }
                                         }
                                     }
                                     else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
                                         //ビットマップリソースをコンボボックスに挿入
-                                        for(i3=0;i3<projectInfo.res.NumberOfBitmapRes;i3++){
-                                            SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.res.pBitmapResInfo[i3].IdName);
-
-                                            if(lstrcmp(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path,projectInfo.res.pBitmapResInfo[i3].IdName)==0)
+                                        for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++){
+                                            SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
+
+                                            if( projectInfo.resourceManager.bitmapResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path )
+                                            {
                                                 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
+                                            }
                                         }
                                     }
@@ -2910 +2919 @@
                         if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON){
                             //アイコンリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.res.NumberOfIconRes;i3++)
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.res.pIconResInfo[i3].IdName);
+                            for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++)
+                            {
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
+                            }
                         }
                         else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
                             //ビットマップリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.res.NumberOfBitmapRes;i3++)
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.res.pBitmapResInfo[i3].IdName);
+                            for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++)
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
                         }
                         break;