Changeset 624 in dev for trunk/ab5.0/abdev/abdev/RadSupport.cpp

Timestamp:

May 23, 2008, 10:35:36 PM (16 years ago)

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/abdev/RadSupport.cpp (modified) (11 diffs)

trunk/ab5.0/abdev/abdev/RadSupport.cpp

@@ -40 +40 @@
     HFONT *lphFont;
     HANDLE *lphImage;
-    int i2,i3;
+    int i2;
     char temporary[MAX_PATH];
 
@@ -50 +50 @@
     }
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
-
-    if(pWindowInfo->style&WS_CHILD){
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+
+    if(pWindowInfo->GetStyle()&WS_CHILD){
         //"チャイルドウィンドウをテスト表示することはできません"
         MessageBox(hOwner,STRING_RAD_ERROR_CANT_CHILDTEST,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
@@ -64 +64 @@
 
     //テスト用のメインウィンドウを作成
-    hWnd=CreateWindowEx(pWindowInfo->ExStyle,
+    hWnd=CreateWindowEx(pWindowInfo->GetExStyle(),
         "TestWindow",
         pWindowInfo->GetName().c_str(),
-        pWindowInfo->style|WS_VISIBLE,
+        pWindowInfo->GetStyle()|WS_VISIBLE,
         CW_USEDEFAULT,CW_USEDEFAULT,
         pWindowInfo->size.cx,pWindowInfo->size.cy,
@@ -73 +73 @@
 
     //子ウィンドウ作成
-    for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){
+    for( i2=0; i2<static_cast<int>(pWindowInfo->childWindowInfos.size()); i2++ )
+    {
         if(pWindowInfo->childWindowInfos[i2]->Control==CT_UPDOWN){
             CreateUpDownControl(
-                pWindowInfo->childWindowInfos[i2]->style,
+                pWindowInfo->childWindowInfos[i2]->GetStyle(),
                 pWindowInfo->childWindowInfos[i2]->pos.x,pWindowInfo->childWindowInfos[i2]->pos.y,
                 pWindowInfo->childWindowInfos[i2]->size.cx,pWindowInfo->childWindowInfos[i2]->size.cy,
@@ -85 +86 @@
             GetItemClassName(temporary,pWindowInfo->childWindowInfos[i2]->Control);
             hChild=CreateWindowEx(
-                pWindowInfo->childWindowInfos[i2]->ExStyle,
+                pWindowInfo->childWindowInfos[i2]->GetExStyle(),
                 temporary,
-                pWindowInfo->childWindowInfos[i2]->caption,
-                pWindowInfo->childWindowInfos[i2]->style,
+                pWindowInfo->childWindowInfos[i2]->GetCaption().c_str(),
+                pWindowInfo->childWindowInfos[i2]->GetStyle(),
                 pWindowInfo->childWindowInfos[i2]->pos.x,
                 pWindowInfo->childWindowInfos[i2]->pos.y,
@@ -102 +103 @@
                 // イメージ ボックスの場合
                 ///////////////////////////
-                if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_ICON){
-                    if(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.type==IMGTYPE_FILE)
-                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path);
-                    else{
-                        for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++)
+                if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_ICON){
+                    if(pWindowInfo->childWindowInfos[i2]->image.IsFile())
+                    {
+                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->image.path.c_str());
+                    }
+                    else
+                    {
+                        temporary[0] = 0;
+                        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
                         {
-                            if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path )
+                            if( resourceItem.idName == pWindowInfo->childWindowInfos[i2]->image.path )
                             {
+                                lstrcpy( temporary, resourceItem.filepath.c_str() );
                                 break;
                             }
                         }
-                        if(i3==projectInfo.resourceManager.iconResources.size()) temporary[0]=0;
-                        else lstrcpy(temporary,projectInfo.resourceManager.iconResources[i3].filepath.c_str());
                     }
                     if(temporary[0]){
@@ -123 +127 @@
                     }
                 }
-                else if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_BITMAP){
-                    if(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.type==IMGTYPE_FILE)
-                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path);
-                    else{
-                        for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++){
-                            if( projectInfo.resourceManager.bitmapResources[i3].idName == pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path )
+                else if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_BITMAP){
+                    if(pWindowInfo->childWindowInfos[i2]->image.IsFile())
+                    {
+                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->image.path.c_str());
+                    }
+                    else
+                    {
+                        temporary[0] = 0;
+                        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+                        {
+                            if( resourceItem.idName == pWindowInfo->childWindowInfos[i2]->image.path )
                             {
+                                lstrcpy( temporary, resourceItem.filepath.c_str() );
                                 break;
                             }
                         }
-                        if(i3==projectInfo.resourceManager.bitmapResources.size()) temporary[0]=0;
-                        else lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i3].filepath.c_str());
                     }
                     if(temporary[0]){
@@ -155 +163 @@
 
     //フォントハンドルを破棄
-    for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){
+    for(i2=0;i2<static_cast<int>(pWindowInfo->childWindowInfos.size());i2++){
         if(lphFont[i2]) DeleteObject(lphFont[i2]);
     }
@@ -161 +169 @@
 
     //イメージハンドルを破棄
-    for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){
+    for(i2=0;i2<static_cast<int>(pWindowInfo->childWindowInfos.size());i2++){
         if(lphImage[i2]){
-            if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_ICON)
+            if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_ICON)
                 DestroyIcon((HICON)lphImage[i2]);
-            else if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_BITMAP)
+            else if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_BITMAP)
                 DeleteObject(lphImage[i2]);
         }
@@ -176 +184 @@
 }
 
-void SetSupportDlgData(int WndNum, const WindowInfo &windowInfo )
+void SetSupportDlgData(int WndNum, const ActiveBasic::PM::WindowInfo &windowInfo )
 {
     ////////////////////////////////////
@@ -307 +315 @@
 
             i=GetWndNum(GetParent(hwnd));
-            WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+            ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
             for(i3=0;;i3++){