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

Timestamp:

May 18, 2008, 4:37:11 PM (16 years ago)

Author:

dai_9181

Message:

ProjectInfo構造体のpWindowInfoメンバをwindowInfosメンバに置き換えた。

File:

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

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

@@ -38 +38 @@
     extern PROJECTINFO ProjectInfo;
     static HWND hWnd;
-    WINDOW_INFO *pWindowInfo;
     HWND hChild;
     HFONT *lphFont;
@@ -52 +51 @@
     }
 
-    pWindowInfo=&ProjectInfo.pWindowInfo[WndInfoNum];
+    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
 
     if(pWindowInfo->style&WS_CHILD){
@@ -187 +186 @@
     hSupport=MdiInfo[WndNum].MdiRadInfo->hSupport;
 
+    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+
     if(RadInfo.NowDragging>=FRAME_CHANGEPOS_START&&RadInfo.NowDragging<=FRAME_CHANGEPOS_END&&
         (!(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]!=-1&&MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1))){
@@ -212 +213 @@
         SetDlgItemText(hSupport,IDC_YPOS,"");
 
-        sprintf(temporary,"%d",ProjectInfo.pWindowInfo[WndInfoNum].size.cx);
+        sprintf(temporary,"%d",pWindowInfo->size.cx);
         SetDlgItemText(hSupport,IDC_WIDTH,temporary);
 
-        sprintf(temporary,"%d",ProjectInfo.pWindowInfo[WndInfoNum].size.cy);
+        sprintf(temporary,"%d",pWindowInfo->size.cy);
         SetDlgItemText(hSupport,IDC_HEIGHT,temporary);
     }
@@ -239 +240 @@
             EnableWindow(GetDlgItem(hSupport,IDC_SPIN4),1);
 
-            sprintf(temporary,"%d",ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].pos.x);
+            sprintf(temporary,"%d",pWindowInfo->pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].pos.x);
             SetDlgItemText(hSupport,IDC_XPOS,temporary);
 
-            sprintf(temporary,"%d",ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].pos.y);
+            sprintf(temporary,"%d",pWindowInfo->pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].pos.y);
             SetDlgItemText(hSupport,IDC_YPOS,temporary);
 
-            sprintf(temporary,"%d",ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].size.cx);
+            sprintf(temporary,"%d",pWindowInfo->pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].size.cx);
             SetDlgItemText(hSupport,IDC_WIDTH,temporary);
 
-            sprintf(temporary,"%d",ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].size.cy);
+            sprintf(temporary,"%d",pWindowInfo->pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].size.cy);
             SetDlgItemText(hSupport,IDC_HEIGHT,temporary);
         }
@@ -260 +261 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
     static BOOL bTimer;
-    int i,i2,i3;
+    int i,i3;
     char temporary[255];
     POINTANDSIZE PointAndSize;
@@ -305 +306 @@
 
             i=GetWndNum(GetParent(hwnd));
-            i2=GetWndInfoNum(MdiInfo[i].path);
+            WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
             for(i3=0;;i3++){
                 if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                PointAndSize.pos=ProjectInfo.pWindowInfo[i2].pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].pos;
-                PointAndSize.size=ProjectInfo.pWindowInfo[i2].pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].size;
+                PointAndSize.pos=pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].pos;
+                PointAndSize.size=pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].size;
                 Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
             }
@@ -318 +319 @@
                 for(i3=0;;i3++){
                     if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                    ProjectInfo.pWindowInfo[i2].pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].pos.x=atol(temporary);
+                    pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].pos.x=atol(temporary);
                 }
             }
@@ -326 +327 @@
                 for(i3=0;;i3++){
                     if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                    ProjectInfo.pWindowInfo[i2].pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].pos.y=atol(temporary);
+                    pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].pos.y=atol(temporary);
                 }
             }
@@ -333 +334 @@
             if(temporary[0]){
                 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                    ProjectInfo.pWindowInfo[i2].size.cx=atol(temporary);
+                    pWindowInfo->size.cx=atol(temporary);
                 else{
                     for(i3=0;;i3++){
                         if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                        ProjectInfo.pWindowInfo[i2].pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].size.cx=atol(temporary);
+                        pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].size.cx=atol(temporary);
                     }
                 }
@@ -345 +346 @@
             if(temporary[0]){
                 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                    ProjectInfo.pWindowInfo[i2].size.cy=atol(temporary);
+                    pWindowInfo->size.cy=atol(temporary);
                 else{
                     for(i3=0;;i3++){
                         if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                        ProjectInfo.pWindowInfo[i2].pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].size.cy=atol(temporary);
+                        pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[i3]].size.cy=atol(temporary);
                     }
                 }
@@ -355 +356 @@
 
             //描画
-            DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]);
+            DrawRadWindow(i,pWindowInfo);
 
             //スクロールバーをリセット