Changeset 615 in dev for trunk/ab5.0/abdev/abdev/RadProc.cpp

Timestamp:

May 19, 2008, 7:38:03 AM (16 years ago)

Author:

dai_9181

Message:

WindowInfosクラスを追加。

File:

• trunk/ab5.0/abdev/abdev/RadProc.cpp (modified) (16 diffs)

trunk/ab5.0/abdev/abdev/RadProc.cpp

@@ -4 +4 @@
 #include "common.h"
 
-void NewRadWindow( const WINDOW_INFO &windowInfo )
+void NewRadWindow( const WindowInfo &windowInfo )
 {
     extern HINSTANCE hInst,hResInst;
@@ -165 +165 @@
     CHILDINFO *pChildInfo;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
-
-    pWindowInfo->pChildInfo=(CHILDINFO *)HeapReAlloc(hHeap,0,pWindowInfo->pChildInfo,(pWindowInfo->NumberOfChildWindows+1)*sizeof(WINDOW_INFO));
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
+
+    pWindowInfo->pChildInfo=(CHILDINFO *)HeapReAlloc(hHeap,0,pWindowInfo->pChildInfo,(pWindowInfo->NumberOfChildWindows+1)*sizeof(WindowInfo));
     if(ItemNum==-1)
         NewItemNum=pWindowInfo->NumberOfChildWindows;
@@ -264 +264 @@
     int i;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     //変更情報
@@ -347 +347 @@
     RECT rect;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     hdc=GetDC(hwnd);
@@ -449 +449 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]==SELECT_WINDOW){
@@ -546 +546 @@
     SCROLLINFO ScrollInfo;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg);
@@ -607 +607 @@
     int i;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     for(i=pWindowInfo->NumberOfChildWindows-1;i>=0;i--){
@@ -669 +669 @@
 
     //サポートダイアログの内容をセット
-    SetSupportDlgData( WndNum, ProjectInfo.windowInfos[WndInfoNum] );
+    SetSupportDlgData( WndNum, *ProjectInfo.windowInfos[WndInfoNum] );
 }
 void SetItemNumOnFrame(int WndNum,int WndInfoNum,RECT *pRect){
@@ -676 +676 @@
     RECT rect;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]=-1;
@@ -701 +701 @@
     RECT rect;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1){
@@ -762 +762 @@
     SIZE NeedSize;
 
-    WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
 
     //必要な幅、高さを共に100ピクセル余裕を持たせる
@@ -817 +817 @@
                 i=GetWndNum(GetParent(hwnd));
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -897 +897 @@
                 i=GetWndNum(hParent);
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -1275 +1275 @@
                 i=GetWndNum(hParent);
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -1440 +1440 @@
                 i=GetWndNum(hParent);
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
@@ -1467 +1467 @@
                 hParent=GetParent(hwnd);
                 i=GetWndNum(hParent);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){