Changeset 629 in dev

Timestamp:

Jun 2, 2008, 11:50:24 PM (16 years ago)

Author:

dai_9181

Message:

MDIINFO構造体をリファクタリング。

Location:

trunk/ab5.0/abdev

Files:

• abdev/Backup.cpp (modified) (3 diffs)
• abdev/Caret.cpp (modified) (24 diffs)
• abdev/ChildWndOnRebar.cpp (modified) (2 diffs)
• abdev/ClassTree.cpp (modified) (3 diffs)
• abdev/CodeFormatter.cpp (modified) (3 diffs)
• abdev/Common.h (modified) (3 diffs)
• abdev/Complement.cpp (modified) (7 diffs)
• abdev/Debugger.cpp (modified) (7 diffs)
• abdev/DialogBoxes.cpp (modified) (1 diff)
• abdev/DocumentAdvice.cpp (modified) (2 diffs)
• abdev/DrawBuffer.cpp (modified) (12 diffs)
• abdev/DrawWindow.cpp (modified) (56 diffs)
• abdev/FileOperation.cpp (modified) (10 diffs)
• abdev/IconEditor.cpp (modified) (14 diffs)
• abdev/IconEditor_Color.cpp (modified) (5 diffs)
• abdev/IconEditor_Main.cpp (modified) (57 diffs)
• abdev/IconEditor_Tool.cpp (modified) (4 diffs)
• abdev/IconEditor_UndoRedo.cpp (modified) (7 diffs)
• abdev/MenuProc.cpp (modified) (33 diffs)
• abdev/MessageCallOperation.cpp (modified) (18 diffs)
• abdev/ParameterHint.cpp (modified) (6 diffs)
• abdev/Print.cpp (modified) (2 diffs)
• abdev/ProjectControl.cpp (modified) (11 diffs)
• abdev/RadProc.cpp (modified) (94 diffs)
• abdev/RadSupport.cpp (modified) (11 diffs)
• abdev/RadToolsAndPropertyProc.cpp (modified) (253 diffs)
• abdev/Rad_UndoRedo.cpp (modified) (27 diffs)
• abdev/Replace.cpp (modified) (15 diffs)
• abdev/Resource.cpp (modified) (3 diffs)
• abdev/Ruler.cpp (modified) (1 diff)
• abdev/Search.cpp (modified) (7 diffs)
• abdev/StringCount.cpp (modified) (2 diffs)
• abdev/SubOperation.cpp (modified) (5 diffs)
• abdev/TabCtrl.cpp (modified) (3 diffs)
• abdev/TextEditor.cpp (modified) (9 diffs)
• abdev/TextEditor_EventProc.cpp (modified) (4 diffs)
• abdev/TextEditor_ImeEvent.cpp (modified) (4 diffs)
• abdev/TextEditor_KeyEvent.cpp (modified) (27 diffs)
• abdev/TextEditor_MouseEvent.cpp (modified) (19 diffs)
• abdev/TextEditor_UndoRedo.cpp (modified) (7 diffs)
• abdev/WebSearch.cpp (modified) (6 diffs)
• abdev/WindowControl.cpp (modified) (5 diffs)
• abdev/abdev.cpp (modified) (50 diffs)
• abdev/abdev.h (modified) (1 diff)
• abdev/abdev.vcproj (modified) (2 diffs)
• abdev/include/MainFrame.h (modified) (5 diffs)
• abdev/include/Program.h (modified) (1 diff)
• abdev/include/ProjectManager/WindowManager.h (modified) (1 diff)
• abdev/include/WindowAreaManager.h (modified) (1 diff)
• abdev/include/WindowCollection.h (modified) (1 diff)
• abdev/include/WindowComponents/MdiWindow.h (modified) (1 diff)
• abdev/menu.cpp (modified) (2 diffs)
• abdev/menu.h (modified) (1 diff)
• abdev/nkf_class.cpp (modified) (4 diffs)
• abdev/rebar.cpp (modified) (1 diff)
• abdev/src/MainFrame.cpp (modified) (39 diffs)
• abdev/src/Program.cpp (modified) (1 diff)
• abdev/src/ProjectManager/ProjectManager.cpp (modified) (6 diffs)
• abdev/src/WindowAreaManager.cpp (modified) (1 diff)
• abdev/src/WindowComponents/MdiWindow.cpp (modified) (1 diff)
• res/resource.h (modified) (2 diffs)

trunk/ab5.0/abdev/abdev/Backup.cpp

@@ -49 +49 @@
 
     for(i=0;i<MdiInfo.size();i++){
-        if(MdiInfo[i].hwnd){
+        if(MdiInfo[i]->hwnd){
             int WndNum;
             WndNum=i;
 
-            if(!IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)) continue;
+            if(!IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)) continue;
 
             //ファイルを保存
             sprintf(temporary,"%sdocument%02d.txt",szBackupDirPath,iNum);
-            WriteBuffer(temporary,MdiInfo[WndNum].pMdiTextEdit->buffer,lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer), false);
+            WriteBuffer(temporary,MdiInfo[WndNum]->pMdiTextEdit->buffer,lstrlen(MdiInfo[WndNum]->pMdiTextEdit->buffer), false);
 
             //情報を追加
-            sprintf(temp2+lstrlen(temp2),"%s\r\n",MdiInfo[WndNum].path.c_str());
+            sprintf(temp2+lstrlen(temp2),"%s\r\n",MdiInfo[WndNum]->path.c_str());
 
             iNum++;
@@ -107 +107 @@
 
         char szOldTitle[MAX_PATH];
-        lstrcpy(szOldTitle,MdiInfo[WndNum].title.c_str());
+        lstrcpy(szOldTitle,MdiInfo[WndNum]->title.c_str());
 
         //ドキュメント セレクト コンボボックスから消去
         extern HWND hDocCombo;
-        i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
+        i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
         SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
 
         //パスを変更
-        MdiInfo[WndNum].path = szBeforeFilePath;
+        MdiInfo[WndNum]->path = szBeforeFilePath;
 
         //ドキュメント セレクト コンボボックスに挿入
@@ -129 +129 @@
         }
         DuplicateTitleCheck(str);
-        MdiInfo[WndNum].title = str;
-        SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum].title.c_str());
-        i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
+        MdiInfo[WndNum]->title = str;
+        SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum]->title.c_str());
+        i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
         SendMessage(hDocCombo,CB_SETCURSEL,i2,0);
 
         //MDIウィンドウのタイトルを再設定
-        SetWindowText(hChild,MdiInfo[WndNum].title.c_str());
+        SetWindowText(hChild,MdiInfo[WndNum]->title.c_str());
 
         //タブコントロールを再設定
         COLORREF TabColor;
-        TabColor=pobj_nv->pobj_ExtLink->GetTabColorFromFilePath(MdiInfo[WndNum].path);
+        TabColor=pobj_nv->pobj_ExtLink->GetTabColorFromFilePath(MdiInfo[WndNum]->path);
         pobj_MainTab->DeleteItem( szOldTitle, false );
-        pobj_MainTab->InsertItem( MdiInfo[WndNum].title.c_str(), false, TabColor );
-
-        MdiInfo[WndNum].pMdiTextEdit->Modify();
+        pobj_MainTab->InsertItem( MdiInfo[WndNum]->title.c_str(), false, TabColor );
+
+        MdiInfo[WndNum]->pMdiTextEdit->Modify();
 
 

trunk/ab5.0/abdev/abdev/Caret.cpp

@@ -124 +124 @@
 
     pCharRange->cpMin=GetBufferIndexFromCaretPos(
-        MdiInfo[WndNum].pMdiTextEdit->buffer,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
-
-    if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x&&
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y){
+        MdiInfo[WndNum]->pMdiTextEdit->buffer,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
+
+    if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x&&
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y){
         //選択されていないとき
         pCharRange->cpMax=pCharRange->cpMin;
@@ -135 +135 @@
     else{
         pCharRange->cpMax=GetBufferIndexFromCaretPos(
-            MdiInfo[WndNum].pMdiTextEdit->buffer,
-            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x,
-            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y);
+            MdiInfo[WndNum]->pMdiTextEdit->buffer,
+            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x,
+            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y);
     }
 
@@ -150 +150 @@
 
     memcpy(buffer,
-        MdiInfo[WndNum].pMdiTextEdit->buffer+pCharRange->cpMin,
+        MdiInfo[WndNum]->pMdiTextEdit->buffer+pCharRange->cpMin,
         pCharRange->cpMax-pCharRange->cpMin);
     buffer[pCharRange->cpMax-pCharRange->cpMin]=0;
@@ -158 +158 @@
 
     HWND hEdit;
-    hEdit=MdiInfo[WndNum].pMdiTextEdit->hEdit;
+    hEdit=MdiInfo[WndNum]->pMdiTextEdit->hEdit;
 
     //垂直スクロールバーの位置
@@ -175 +175 @@
 
     HWND hEdit;
-    hEdit=GetWindow(MdiInfo[WndNum].hwnd,GW_CHILD);
+    hEdit=GetWindow(MdiInfo[WndNum]->hwnd,GW_CHILD);
 
     //垂直スクロールバーの位置
@@ -192 +192 @@
 
     GetCaretPosFromBufferIndex(
-        MdiInfo[WndNum].pMdiTextEdit->buffer,
+        MdiInfo[WndNum]->pMdiTextEdit->buffer,
         StartIndex,
-        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
 
     GetCaretPosFromBufferIndex(
-        MdiInfo[WndNum].pMdiTextEdit->buffer,
+        MdiInfo[WndNum]->pMdiTextEdit->buffer,
         EndIndex,
-        &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
+        &MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos);
 
     HWND hEdit;
-    hEdit=GetWindow(MdiInfo[WndNum].hwnd,GW_CHILD);
+    hEdit=GetWindow(MdiInfo[WndNum]->hwnd,GW_CHILD);
 
     if(!TextEdit_ScrollCaret(WndNum,0,bShowCenter))
@@ -218 +218 @@
     int iStartPos;
     iStartPos=code_pos;
-    while(MdiInfo[WndNum].pMdiTextEdit->buffer[iStartPos]!='\n'&&iStartPos>0) iStartPos--;
-    if(MdiInfo[WndNum].pMdiTextEdit->buffer[iStartPos]=='\n') iStartPos++;
+    while(MdiInfo[WndNum]->pMdiTextEdit->buffer[iStartPos]!='\n'&&iStartPos>0) iStartPos--;
+    if(MdiInfo[WndNum]->pMdiTextEdit->buffer[iStartPos]=='\n') iStartPos++;
 
     int iEndPos;
     iEndPos=code_pos;
-    while(MdiInfo[WndNum].pMdiTextEdit->buffer[iEndPos]!='\r'&&MdiInfo[WndNum].pMdiTextEdit->buffer[iEndPos]!='\0') iEndPos++;
+    while(MdiInfo[WndNum]->pMdiTextEdit->buffer[iEndPos]!='\r'&&MdiInfo[WndNum]->pMdiTextEdit->buffer[iEndPos]!='\0') iEndPos++;
 
     TextEdit_SetSel(WndNum,iStartPos,iEndPos,bShowCenter);
@@ -234 +234 @@
     GetCaretPos(&OldPos);
 
-    x=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x;
-    y=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y;
+    x=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x;
+    y=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y;
     GetScrollBaseCaretPos(WndNum,&x,&y);
 
     //エディタ画面左端のコントロールタブ
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     //コントロールタブ上にカーソルがきたときに、非表示にする
-    if(OldPos.x>=iControlTabSpace&&x<0) HideCaret(MdiInfo[WndNum].pMdiTextEdit->hEdit);
-    else if(OldPos.x<iControlTabSpace&&x>=0) ShowCaret(MdiInfo[WndNum].pMdiTextEdit->hEdit);
+    if(OldPos.x>=iControlTabSpace&&x<0) HideCaret(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
+    else if(OldPos.x<iControlTabSpace&&x>=0) ShowCaret(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
 
     SetCaretPos(
@@ -256 +256 @@
     // Web検索文字列
     //////////////////////////////////////////////
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         int start,end;
-        if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x&&
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y){
+        if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x&&
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y){
             //文字列を選択中でないとき
 
             int sw=0;
             if(bInputAndReset){
-                if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x>1){
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x-=2;
+                if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x>1){
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x-=2;
                     sw=1;
                 }
@@ -271 +271 @@
 
             TextEdit_GetWordCaret(
-                MdiInfo[WndNum].pMdiTextEdit->hEdit,
+                MdiInfo[WndNum]->pMdiTextEdit->hEdit,
                 WndNum,
-                &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos,
+                &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos,
                 &start,&end,
                 WORDCARET_BEFORE);
 
-            if(sw) MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x+=2;
+            if(sw) MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x+=2;
 
             //半角文字列を選択時の全角とのズレを修正
             POINT pos;
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,start,&pos);
-            start=GetBufferIndexFromCaretPos(MdiInfo[WndNum].pMdiTextEdit->buffer,pos.x,pos.y);
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,end,&pos);
-            end=GetBufferIndexFromCaretPos(MdiInfo[WndNum].pMdiTextEdit->buffer,pos.x,pos.y);
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,start,&pos);
+            start=GetBufferIndexFromCaretPos(MdiInfo[WndNum]->pMdiTextEdit->buffer,pos.x,pos.y);
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,end,&pos);
+            end=GetBufferIndexFromCaretPos(MdiInfo[WndNum]->pMdiTextEdit->buffer,pos.x,pos.y);
         }
         else{
             //文字列を選択中のとき
             start=GetBufferIndexFromCaretPos(
-                MdiInfo[WndNum].pMdiTextEdit->buffer,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+                MdiInfo[WndNum]->pMdiTextEdit->buffer,
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
             end=GetBufferIndexFromCaretPos(
-                MdiInfo[WndNum].pMdiTextEdit->buffer,
-                MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x,
-                MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y);
+                MdiInfo[WndNum]->pMdiTextEdit->buffer,
+                MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x,
+                MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y);
         }
 
@@ -310 +310 @@
         if(length<0) length=0;
         pTemp=(char *)HeapAlloc(hHeap,0,length+1024);
-        memcpy(pTemp,MdiInfo[WndNum].pMdiTextEdit->buffer+start,length);
+        memcpy(pTemp,MdiInfo[WndNum]->pMdiTextEdit->buffer+start,length);
         pTemp[length]=0;
 
@@ -340 +340 @@
     extern METHODCHECKINFO MethodCheckInfo;
     if(MethodCheckInfo.hWnd){
-        if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC)
+        if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC)
             ShowParameterHint(WndNum);
     }
@@ -354 +354 @@
         char *pTemp,temporary[VN_SIZE];
 
-        i=GetBufferIndexFromCaretPos(MdiInfo[WndNum].pMdiTextEdit->buffer,
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        i=GetBufferIndexFromCaretPos(MdiInfo[WndNum]->pMdiTextEdit->buffer,
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
 
         if(i<ComplementWndInfo.iPos||ComplementWndInfo.iPos+ComplementWndInfo.iLength<i){
@@ -379 +379 @@
             pTemp=(char *)HeapAlloc(hHeap,0,ComplementWndInfo.iLength+1);
             memcpy(pTemp,
-                MdiInfo[WndNum].pMdiTextEdit->buffer+ComplementWndInfo.iPos,
+                MdiInfo[WndNum]->pMdiTextEdit->buffer+ComplementWndInfo.iPos,
                 ComplementWndInfo.iLength);
             pTemp[ComplementWndInfo.iLength]=0;
@@ -432 +432 @@
             pTemp=(char *)HeapAlloc(hHeap,0,ComplementWndInfo.iLength+1);
             memcpy(pTemp,
-                MdiInfo[WndNum].pMdiTextEdit->buffer+ComplementWndInfo.iPos,
+                MdiInfo[WndNum]->pMdiTextEdit->buffer+ComplementWndInfo.iPos,
                 ComplementWndInfo.iLength);
             pTemp[ComplementWndInfo.iLength]=0;
@@ -462 +462 @@
 
     HWND hEdit;
-    hEdit=MdiInfo[WndNum].pMdiTextEdit->hEdit;
-
-    x=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x;
-    y=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y;
+    hEdit=MdiInfo[WndNum]->pMdiTextEdit->hEdit;
+
+    x=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x;
+    y=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y;
     GetScrollBaseCaretPos(WndNum,&x,&y);
 
@@ -537 +537 @@
     if(loose_y<0) loose_y=0;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     // 行の確認
@@ -659 +659 @@
 
     POINT *pCaretPos;
-    pCaretPos=&MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+    pCaretPos=&MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
 
     if(pCaretPos->x==0&&pCaretPos->y==0){
@@ -666 +666 @@
     }
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     i=GetBufferIndexFromCaretPos(pBuf,
@@ -711 +711 @@
     char *pBuf;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     i=GetBufferIndexFromCaretPos(pBuf,
@@ -768 +768 @@
 
     //上下のキャレット移動時には、左右方向の位置を保持する
-    if(MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
+    if(MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
 
     pCaretPos->y--;
 
     CaretPos_LooseToNatural(WndNum,
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos,
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos,
         pCaretPos->y,
         pCaretPos);
@@ -784 +784 @@
 
     //上下のキャレット移動時には、左右方向の位置を保持する
-    if(MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
+    if(MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
 
     pCaretPos->y++;
 
     CaretPos_LooseToNatural(WndNum,
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos,
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos,
         pCaretPos->y,
         pCaretPos);
@@ -805 +805 @@
 
     //上下のキャレット移動時には、左右方向の位置を保持する
-    if(MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
+    if(MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
 
     SCROLLINFO si;
     si.cbSize=sizeof(SCROLLINFO);
     si.fMask=SIF_PAGE;
-    GetScrollInfo(MdiInfo[WndNum].pMdiTextEdit->hEdit,SB_VERT,&si);
+    GetScrollInfo(MdiInfo[WndNum]->pMdiTextEdit->hEdit,SB_VERT,&si);
     pCaretPos->y-=si.nPage;
     if(pCaretPos->y<0) pCaretPos->y=0;
 
     CaretPos_LooseToNatural(WndNum,
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos,
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos,
         pCaretPos->y,
         pCaretPos);
@@ -826 +826 @@
 
     //上下のキャレット移動時には、左右方向の位置を保持する
-    if(MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
+    if(MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos==-1)
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=pCaretPos->x;
 
     SCROLLINFO si;
     si.cbSize=sizeof(SCROLLINFO);
     si.fMask=SIF_PAGE;
-    GetScrollInfo(MdiInfo[WndNum].pMdiTextEdit->hEdit,SB_VERT,&si);
+    GetScrollInfo(MdiInfo[WndNum]->pMdiTextEdit->hEdit,SB_VERT,&si);
     pCaretPos->y+=si.nPage;
 
     CaretPos_LooseToNatural(WndNum,
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos,
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos,
         pCaretPos->y,
         pCaretPos);

trunk/ab5.0/abdev/abdev/ChildWndOnRebar.cpp

@@ -48 +48 @@
                 SendMessage(hwnd,CB_GETLBTEXT,SendMessage(hwnd,CB_GETCURSEL,0,0),(long)str);
                 for(i=0;i<MdiInfo.size();i++){
-                    if(lstrcmpi(str,MdiInfo[i].title.c_str())==0) break;
+                    if(lstrcmpi(str,MdiInfo[i]->title.c_str())==0) break;
                 }
-                BringWindowToTop(MdiInfo[i].hwnd);
+                BringWindowToTop(MdiInfo[i]->hwnd);
             }
             break;
@@ -199 +199 @@
     if(IsWindow(hTempWnd)){
         for(i=0,i2=0;i<MdiInfo.size();i++){
-            if(MdiInfo[i].hwnd){
-                GetWindowText(MdiInfo[i].hwnd,buffer,MAX_PATH);
-                if(MdiInfo[i].hwnd==hTempWnd) i2=SendMessage(hDocCombo,CB_ADDSTRING,0,(long)buffer);
+            if(MdiInfo[i]->hwnd){
+                GetWindowText(MdiInfo[i]->hwnd,buffer,MAX_PATH);
+                if(MdiInfo[i]->hwnd==hTempWnd) i2=SendMessage(hDocCombo,CB_ADDSTRING,0,(long)buffer);
                 else SendMessage(hDocCombo,CB_ADDSTRING,0,(long)buffer);
             }

trunk/ab5.0/abdev/abdev/ClassTree.cpp

@@ -450 +450 @@
         if( WndNum != -1 )
         {
-            if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),lpszFilePath)==0) break;
+            if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
+                if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),lpszFilePath)==0) break;
             }
             hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -460 +460 @@
     if(hChild){
         //すでに指定されたファイルが開かれている場合
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
     }
     else{
@@ -579 +579 @@
         HWND hChild=GetWindow(hClient,GW_CHILD);
         int WndNum=GetWndNum(hChild);
-        char *pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        char *pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
         SetClassTreeFromOneFile_Buf( pBuf, -1 );
 

trunk/ab5.0/abdev/abdev/CodeFormatter.cpp

@@ -12 +12 @@
     WndNum=GetNowWndNum();
 
-    if(MdiInfo[WndNum].DocType!=WNDTYPE_BASIC){
+    if(MdiInfo[WndNum]->DocType!=WNDTYPE_BASIC){
         goto NonFormater;
     }
@@ -38 +38 @@
 
     char *pBuf;
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     //カーソルバッファ位置を取得
     int i,i2;
     i=GetBufferIndexFromCaretPos(pBuf,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
-    int StartX=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x;
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
+    int StartX=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x;
 
     //現在の行のインデントをコピー（iFirstIndent_Speciallyにタブ数を格納）
@@ -83 +83 @@
     }
 
-    if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC){
+    if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC){
         //インデント追加のコマンドかどうかを判断
         if(IsIndentAdditionCommand_FromBuffer(pBuf+i+iIndent)) iIndent++;

trunk/ab5.0/abdev/abdev/Common.h

@@ -366 +366 @@
     char *IndentStr;
 };
-extern std::vector<MDIINFO> MdiInfo;
+extern std::vector<MDIINFO *> MdiInfo;
 
 //RADツールのマウスドラッグ
@@ -618 +618 @@
 void CloseDocWindow(int WndNum);
 void ResizeTextEditWnd(HWND hwnd,int cx,int cy);
-void ResizeOwnerWnd(void);
 #define FLAG_DBLCLK     1
 #define FLAG_BEAMCURSOR 2
@@ -730 +729 @@
 BOOL SetupProjectEditor(void);
 void EndProjectEditor(void);
-void SetupWindow(HWND hwnd);
 BOOL SetRunning(HWND hChild);
 BOOL IsNeedCompile( const std::string &filepath, BOOL bDebug );

trunk/ab5.0/abdev/abdev/Complement.cpp

@@ -386 +386 @@
     //エディタ画面左端のコントロールタブ
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     extern int font_width,font_height;
     POINT pos;
-    pos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+    pos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
     GetScrollBaseCaretPos(WndNum,(int *)&pos.x,(int *)&pos.y);
 
@@ -396 +396 @@
     pos.y=(pos.y+1)*font_height;
 
-    ClientToScreen(MdiInfo[WndNum].pMdiTextEdit->hEdit,&pos);
+    ClientToScreen(MdiInfo[WndNum]->pMdiTextEdit->hEdit,&pos);
 
     extern HINSTANCE hInst;
@@ -621 +621 @@
             //フォーカスをエディタに戻す
             WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-            SetFocus(MdiInfo[WndNum].pMdiTextEdit->hEdit);
+            SetFocus(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
             return 0;
         case WM_KEYDOWN:
@@ -633 +633 @@
             //フォーカスをエディタに戻す
             WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-            SetFocus(MdiInfo[WndNum].pMdiTextEdit->hEdit);
+            SetFocus(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
 
             LVHITTESTINFO lvHitTest;
@@ -659 +659 @@
 
                     for(i=ComplementWndInfo.iPos-1;;i--){
-                        if(MdiInfo[WndNum].pMdiTextEdit->buffer[i]!='\t'){
+                        if(MdiInfo[WndNum]->pMdiTextEdit->buffer[i]!='\t'){
                             i++;
                             break;
@@ -665 +665 @@
                     }
 
-                    GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+                    GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
                         i,
-                        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
 
                     //インデント
@@ -684 +684 @@
                     //クラスメンバ補完
 
-                    GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+                    GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
                         ComplementWndInfo.iPos,
-                        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
 
                     //リプレース前に補完機能を破棄する

trunk/ab5.0/abdev/abdev/Debugger.cpp

@@ -44 +44 @@
         else{
             if(IsWindow(hChild)){
-                if(MdiInfo[GetWndNum(hChild)].DocType==WNDTYPE_BASIC){
+                if(MdiInfo[GetWndNum(hChild)]->DocType==WNDTYPE_BASIC){
                     //有効（Basicプログラムファイルを開いているとき）
                     bEnableDocument=1;
@@ -52 +52 @@
 
         if(IsWindow(hChild)){
-            if(MdiInfo[GetWndNum(hChild)].DocType==WNDTYPE_BASIC){
+            if(MdiInfo[GetWndNum(hChild)]->DocType==WNDTYPE_BASIC){
                 //ブレークポイント有効（Basicプログラムファイルを開いているとき）
                 bBreakPoint=1;
@@ -251 +251 @@
 
         char temporary[MAX_PATH];
-        sprintf(temporary,"\"%s\",%d",MdiInfo[WndNum].path.c_str(),MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        sprintf(temporary,"\"%s\",%d",MdiInfo[WndNum]->path.c_str(),MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
 
         char temp2[MAX_PATH];
@@ -429 +429 @@
     if(WndNum==-1) return;
 
-    if( !Jenga::Common::Path( MdiInfo[WndNum].path ).IsExistFile() )
+    if( !Jenga::Common::Path( MdiInfo[WndNum]->path ).IsExistFile() )
     {
         return;
@@ -436 +436 @@
     int i,i2,sw=0;
     for(i=0;i<num;i++){
-        if(lstrcmpi(MdiInfo[WndNum].path.c_str(),ppItem[i]->lpszFileName)==0){
+        if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),ppItem[i]->lpszFileName)==0){
             for(i2=0;i2<ppItem[i]->num;i2++){
-                if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==ppItem[i]->piLine[i2]){
+                if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==ppItem[i]->piLine[i2]){
                     sw=1;
                     break;
@@ -449 +449 @@
     if(sw==0){
         //ブレークポイントを追加
-        insert(MdiInfo[WndNum].path.c_str(),MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        insert(MdiInfo[WndNum]->path.c_str(),MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
     }
     else{
         //ブレークポイントを削除
-        remove(MdiInfo[WndNum].path.c_str(),MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        remove(MdiInfo[WndNum]->path.c_str(),MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
     }
 
@@ -464 +464 @@
 
     //エディタを再描画
-    InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->hEdit,NULL,0);
+    InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->hEdit,NULL,0);
 }
 void CDBBreakPoint::SaveToTempFile(void){

trunk/ab5.0/abdev/abdev/DialogBoxes.cpp

@@ -1130 +1130 @@
         //delete pobj_SideWeb;
         //pobj_SideWeb=new CSideWeb(hOwner);
-        //ResizeOwnerWnd();
+        //ActiveBasic::IDE::Program::mainFrame.Resized();
     }
     return;

trunk/ab5.0/abdev/abdev/DocumentAdvice.cpp

@@ -180 +180 @@
 #define MEM_SPACE 1024 //強制終了を防ぐためのゆとりスペース
             for(i3=0;i3<MdiInfo.size();i3++){
-                if(MdiInfo[i3].hwnd){
-                    if(lstrcmpi(temporary,MdiInfo[i3].path.c_str())==0) break;
+                if(MdiInfo[i3]->hwnd){
+                    if(lstrcmpi(temporary,MdiInfo[i3]->path.c_str())==0) break;
                 }
             }
@@ -202 +202 @@
             else{
                 //エディタから読み取る
-                FileSize=lstrlen(MdiInfo[i3].pMdiTextEdit->buffer);
+                FileSize=lstrlen(MdiInfo[i3]->pMdiTextEdit->buffer);
 
                 temp3=(char *)HeapAlloc(hHeap,0,FileSize+MEM_SPACE);
-                memcpy(temp3,MdiInfo[i3].pMdiTextEdit->buffer,FileSize);
+                memcpy(temp3,MdiInfo[i3]->pMdiTextEdit->buffer,FileSize);
                 temp3[FileSize]=0;
             }

trunk/ab5.0/abdev/abdev/DrawBuffer.cpp

@@ -193 +193 @@
             if( projectInfo.IsOpened() ){
                 pobj_FileBreakPoint=
-                    projectInfo.pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum].path.c_str());
+                    projectInfo.pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum]->path.c_str());
             }
             else{
                 extern CDBBreakPoint *pobj_DBBreakPoint;
-                pobj_FileBreakPoint=pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum].path.c_str());
+                pobj_FileBreakPoint=pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum]->path.c_str());
             }
 
@@ -278 +278 @@
 
     RECT ClientRect;
-    hEdit=GetWindow(MdiInfo[WndNum].hwnd,GW_CHILD);
+    hEdit=GetWindow(MdiInfo[WndNum]->hwnd,GW_CHILD);
     GetClientRect(hEdit,&ClientRect);
 
@@ -284 +284 @@
     int iControlTabSpace;
     int iLineNumberTextCount;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
-    iLineNumberTextCount=MdiInfo[WndNum].pMdiTextEdit->iLineNumberTextCount;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
+    iLineNumberTextCount=MdiInfo[WndNum]->pMdiTextEdit->iLineNumberTextCount;
 
     //一ページ中に表示できる行数を取得
@@ -302 +302 @@
 
     //テキストバッファをコード内で参照しやすいようにポインタ変数を利用する
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     //選択範囲を取得
@@ -336 +336 @@
         if(pBuf[i]=='\0'){
             if(0<=y&&y<=OnePage_CharHeight){
-                if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==y-BaseY){
+                if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==y-BaseY){
                     ////////////////////////////////////
                     // カーソル行では余白を塗りつぶす
@@ -376 +376 @@
             /////////////////
 
-            if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==y-BaseY){
+            if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==y-BaseY){
                 ///////////////////////////////////////////////////////////
                 //改行コードよりも右側は白いブラシで塗りつぶす（カーソル行用）
@@ -405 +405 @@
         }
 
-        if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC){
+        if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC){
 
             if(pBuf[i]=='\"'&&dwComment==0) IsStr^=1;
@@ -434 +434 @@
             if(dwComment!=0&&dwComment!=10) dwComment--;
         }
-        if(MdiInfo[WndNum].DocType==WNDTYPE_HTML){
+        if(MdiInfo[WndNum]->DocType==WNDTYPE_HTML){
             //複数行に渡るコメントを考慮
             if(pBuf[i]=='<'&&pBuf[i+1]=='!'&&pBuf[i+2]=='-'&&pBuf[i+3]=='-'&&IsStr==0&&dwComment==0){
@@ -447 +447 @@
 
         //ハイパーリンク用下線
-        if(MdiInfo[WndNum].pMdiTextEdit->iUnderStart<=i&&i<MdiInfo[WndNum].pMdiTextEdit->iUnderEnd)
+        if(MdiInfo[WndNum]->pMdiTextEdit->iUnderStart<=i&&i<MdiInfo[WndNum]->pMdiTextEdit->iUnderEnd)
             bHyperLinkUnderBar=1;
         else bHyperLinkUnderBar=0;
@@ -464 +464 @@
             else{
                 //通常カラー
-                NextColor=MdiInfo[WndNum].pMdiTextEdit->pColorRef[i];
+                NextColor=MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i];
             }
 
@@ -473 +473 @@
             }
             else{
-                if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==y-BaseY){
+                if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==y-BaseY){
                     //カーソル行
                     NextBackColor=CaretBackColor;
@@ -524 +524 @@
 
 
-                if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==y-BaseY){
+                if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==y-BaseY){
                     ///////////////////////////////////////////////////////////
                     //改行コードよりも右側は白いブラシで塗りつぶす（カーソル行用）

trunk/ab5.0/abdev/abdev/DrawWindow.cpp

@@ -4 +4 @@
 
 void DrawLineInClient(int WndNum,long StartX,long StartY,long EndX,long EndY){
-    MoveToEx(MdiInfo[WndNum].MdiRadInfo->hMemDC,
-        StartX+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-        StartY+MdiInfo[WndNum].MdiRadInfo->ClientPos.y,
+    MoveToEx(MdiInfo[WndNum]->MdiRadInfo->hMemDC,
+        StartX+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+        StartY+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y,
         NULL);
-    LineTo(MdiInfo[WndNum].MdiRadInfo->hMemDC,
-        EndX+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-        EndY+MdiInfo[WndNum].MdiRadInfo->ClientPos.y);
+    LineTo(MdiInfo[WndNum]->MdiRadInfo->hMemDC,
+        EndX+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+        EndY+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y);
 }
 void DrawRectangleInClient(int WndNum,long left,long top,long right,long bottom,COLORREF RGB_Pen,COLORREF RGB_Brush,BOOL bBrushing){
@@ -19 +19 @@
     if(bBrushing) hBrush=CreateSolidBrush(RGB_Brush);
     else hBrush=(HBRUSH)GetStockObject(NULL_BRUSH);
-    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
-    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hBrush);
-
-    Rectangle(MdiInfo[WndNum].MdiRadInfo->hMemDC,
-        left+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-        top+MdiInfo[WndNum].MdiRadInfo->ClientPos.y,
-        right+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-        bottom+MdiInfo[WndNum].MdiRadInfo->ClientPos.y);
-
-    SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
-    SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldBrush);
+    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
+    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hBrush);
+
+    Rectangle(MdiInfo[WndNum]->MdiRadInfo->hMemDC,
+        left+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+        top+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y,
+        right+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+        bottom+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y);
+
+    SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
+    SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldBrush);
     DeleteObject(hPen);
     if(bBrushing) DeleteObject(hBrush);
@@ -38 +38 @@
     //光源方向の縁
     hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
     DrawLineInClient(WndNum,
         pPos->x, pPos->y,
@@ -45 +45 @@
         pPos->x, pPos->y,
         pPos->x, pPos->y+pSize->cy-1);
-    SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+    SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
     DeleteObject(hPen);
 
     //影側の縁
     hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DDKSHADOW));
-    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
     DrawLineInClient(WndNum,
         pPos->x, pPos->y+pSize->cy-1,
@@ -57 +57 @@
         pPos->x+pSize->cx-1, pPos->y,
         pPos->x+pSize->cx-1, pPos->y+pSize->cy-1);
-    SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+    SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
     DeleteObject(hPen);
 
     hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DSHADOW));
-    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
     DrawLineInClient(WndNum,
         pPos->x+1, pPos->y+pSize->cy-2,
@@ -68 +68 @@
         pPos->x+pSize->cx-2, pPos->y+1,
         pPos->x+pSize->cx-2, pPos->y+pSize->cy-2);
-    SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+    SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
     DeleteObject(hPen);
 
@@ -90 +90 @@
         //モーダル フレーム境界線
 
-        rect.left=pPos->x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-        rect.top=pPos->y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-        rect.right=pPos->x+pSize->cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-        rect.bottom=pPos->y+pSize->cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-        DrawEdge(MdiInfo[WndNum].MdiRadInfo->hMemDC,&rect,EDGE_RAISED,BF_RECT);
+        rect.left=pPos->x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+        rect.top=pPos->y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+        rect.right=pPos->x+pSize->cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+        rect.bottom=pPos->y+pSize->cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+        DrawEdge(MdiInfo[WndNum]->MdiRadInfo->hMemDC,&rect,EDGE_RAISED,BF_RECT);
         pPos->x+=2;
         pPos->y+=2;
@@ -117 +117 @@
         //影側の色
         hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DSHADOW));
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         DrawLineInClient(WndNum,
             pPos->x,
@@ -128 +128 @@
             pPos->x+pSize->cx-1,
             pPos->y);
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
         //光源方向の縁
         hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         DrawLineInClient(WndNum,
             pPos->x,
@@ -144 +144 @@
             pPos->x+pSize->cx-1,
             pPos->y+pSize->cy);
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
@@ -156 +156 @@
         //クライアント境界線
 
-        rect.left=pPos->x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-        rect.top=pPos->y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-        rect.right=pPos->x+pSize->cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-        rect.bottom=pPos->y+pSize->cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-        DrawEdge(MdiInfo[WndNum].MdiRadInfo->hMemDC,&rect,EDGE_SUNKEN,BF_RECT);
+        rect.left=pPos->x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+        rect.top=pPos->y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+        rect.right=pPos->x+pSize->cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+        rect.bottom=pPos->y+pSize->cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+        DrawEdge(MdiInfo[WndNum]->MdiRadInfo->hMemDC,&rect,EDGE_SUNKEN,BF_RECT);
         pPos->x+=2;
         pPos->y+=2;
@@ -198 +198 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -205 +205 @@
                 DrawLineInClient(WndNum,i+pos.x+2,i2,i+pos.x+2,i2+(i*2)+1);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -213 +213 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.y+(size.cy/2);
         for(i=0;i<4;i++,i2--){
             DrawLineInClient(WndNum,i+pos.x+2,i2,i+pos.x+2,i2+(i*2)+1);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
@@ -244 +244 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -251 +251 @@
                 DrawLineInClient(WndNum,i+pos.x+3,i2,i+pos.x+3,i2+((3-i)*2)+1);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -259 +259 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.y+(size.cy/2);
         for(i=3;i>=0;i--,i2--){
             DrawLineInClient(WndNum,i+pos.x+3,i2,i+pos.x+3,i2+((3-i)*2)+1);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
@@ -331 +331 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -338 +338 @@
                 DrawLineInClient(WndNum,i2,i+pos.y+2,i2+(i*2)+1,i+pos.y+2);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -346 +346 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.x+(size.cx/2)-1;
         for(i=0;i<4;i++,i2--){
             DrawLineInClient(WndNum,i2,i+pos.y+2,i2+(i*2)+1,i+pos.y+2);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
@@ -378 +378 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -385 +385 @@
                 DrawLineInClient(WndNum,i2,i+pos.y+3,i2+((3-i)*2)+1,i+pos.y+3);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -393 +393 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.x+(size.cx/2);
         for(i=3;i>=0;i--,i2--){
             DrawLineInClient(WndNum,i2,i+pos.y+3,i2+((3-i)*2)+1,i+pos.y+3);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
@@ -454 +454 @@
         BitmapInfo.bmiHeader.biBitCount=24;
 
-        hBitmap=CreateDIBSection(MdiInfo[WndNum].MdiRadInfo->hMemDC,&BitmapInfo,DIB_RGB_COLORS,(void **)&pByte,0,0);
+        hBitmap=CreateDIBSection(MdiInfo[WndNum]->MdiRadInfo->hMemDC,&BitmapInfo,DIB_RGB_COLORS,(void **)&pByte,0,0);
         i=BitmapInfo.bmiHeader.biWidth*3;
         if(i%sizeof(LONG)!=0) i+=sizeof(LONG)-(i%sizeof(LONG));
@@ -469 +469 @@
             }
         }
-        SetDIBitsToDevice(MdiInfo[WndNum].MdiRadInfo->hMemDC,
-            pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-            pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y,
+        SetDIBitsToDevice(MdiInfo[WndNum]->MdiRadInfo->hMemDC,
+            pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+            pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y,
             BitmapInfo.bmiHeader.biWidth, BitmapInfo.bmiHeader.biHeight,
             0,0,
@@ -505 +505 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -512 +512 @@
                 DrawLineInClient(WndNum,i+pos.x+2,i2,i+pos.x+2,i2+(i*2)+1);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -520 +520 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.y+(size.cy/2);
         for(i=0;i<4;i++,i2--){
             DrawLineInClient(WndNum,i+pos.x+2,i2,i+pos.x+2,i2+(i*2)+1);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
@@ -543 +543 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -550 +550 @@
                 DrawLineInClient(WndNum,i+pos.x+3,i2,i+pos.x+3,i2+((3-i)*2)+1);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -558 +558 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.y+(size.cy/2);
         for(i=3;i>=0;i--,i2--){
             DrawLineInClient(WndNum,i+pos.x+3,i2,i+pos.x+3,i2+((3-i)*2)+1);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
     }
@@ -584 +584 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -591 +591 @@
                 DrawLineInClient(WndNum,i2,i+pos.y+2,i2+(i*2)+1,i+pos.y+2);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -599 +599 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.x+(size.cx/2)-1;
         for(i=0;i<4;i++,i2--){
             DrawLineInClient(WndNum,i2,i+pos.y+2,i2+(i*2)+1,i+pos.y+2);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
 
@@ -623 +623 @@
         if(style&WS_DISABLED){
             hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
-            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+            hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
             pos.x++;
             pos.y++;
@@ -630 +630 @@
                 DrawLineInClient(WndNum,i2,i+pos.y+3,i2+((3-i)*2)+1,i+pos.y+3);
             }
-            SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+            SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
             DeleteObject(hPen);
             rgb=GetSysColor(COLOR_GRAYTEXT);
@@ -638 +638 @@
         else rgb=GetSysColor(COLOR_BTNTEXT);
         hPen=CreatePen(PS_SOLID,0,rgb);
-        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hPen);
+        hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hPen);
         i2=pos.x+(size.cx/2);
         for(i=3;i>=0;i--,i2--){
             DrawLineInClient(WndNum,i2,i+pos.y+3,i2+((3-i)*2)+1,i+pos.y+3);
         }
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldPen);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldPen);
         DeleteObject(hPen);
     }
@@ -748 +748 @@
 
     //Draw...InClient関数のため
-    MdiInfo[WndNum].MdiRadInfo->ClientPos.x=0;
-    MdiInfo[WndNum].MdiRadInfo->ClientPos.y=0;
+    MdiInfo[WndNum]->MdiRadInfo->ClientPos.x=0;
+    MdiInfo[WndNum]->MdiRadInfo->ClientPos.y=0;
 
     if(pWindowInfo->GetStyle()&(WS_CAPTION&(~WS_BORDER))){
@@ -940 +940 @@
 
     //クライアント左上ポジションを設定
-    MdiInfo[WndNum].MdiRadInfo->ClientPos.x=InsideRect.left;
-    MdiInfo[WndNum].MdiRadInfo->ClientPos.y=InsideRect.top;
+    MdiInfo[WndNum]->MdiRadInfo->ClientPos.x=InsideRect.left;
+    MdiInfo[WndNum]->MdiRadInfo->ClientPos.y=InsideRect.top;
 
     //ExStyleによる縁を描画
@@ -954 +954 @@
 
     //クライアント領域のサイズを設定
-    MdiInfo[WndNum].MdiRadInfo->ClientSize=size;
+    MdiInfo[WndNum]->MdiRadInfo->ClientSize=size;
 
 
@@ -1043 +1043 @@
                 //キャプション テキスト
 
-                rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.top=pos.y+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-                rect.right=pos.x+size.cx-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                rect.left=pos.x+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.top=pos.y+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+                rect.right=pos.x+size.cx-2+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
 
                 if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0;
@@ -1116 +1116 @@
             if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){
                 //キャプション テキスト
-                rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.top=pos.y+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-                rect.right=pos.x+size.cx-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                rect.left=pos.x+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.top=pos.y+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+                rect.right=pos.x+size.cx-2+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
 
                 if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0;
@@ -1236 +1236 @@
 
             //キャプション テキスト
-            rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-            rect.top=pos.y+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-            rect.right=pos.x+size.cx-1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-            rect.bottom=pos.y+size.cy-1+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+            rect.left=pos.x+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+            rect.top=pos.y+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+            rect.right=pos.x+size.cx-1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+            rect.bottom=pos.y+size.cy-1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
 
             if(pChildInfo->GetStyle()&ES_MULTILINE) i4=0;
@@ -1268 +1268 @@
 
             //枠を描画
-            rect.left=pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-            rect.top=pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y+(size2.cy/2);
-            rect.right=pos.x+size.cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-            rect.bottom=pos.y+size.cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+            rect.left=pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+            rect.top=pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+(size2.cy/2);
+            rect.right=pos.x+size.cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+            rect.bottom=pos.y+size.cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
             DrawEdge(hdc,&rect,EDGE_ETCHED,BF_RECT);
 
@@ -1295 +1295 @@
 
             if(!((pChildInfo->GetStyle()&BS_ICON)||(pChildInfo->GetStyle()&BS_BITMAP))){
-                rect.left+=MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.top+=MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-                rect.right+=MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.bottom+=MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                rect.left+=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.top+=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+                rect.right+=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.bottom+=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
                 rect.left+=2;
                 rect.right-=2;
@@ -1338 +1338 @@
                 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(255,255,255),0,0);
             else if((pChildInfo->GetStyle()&0x0000001F)==SS_ETCHEDFRAME){
-                rect.left=pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.top=pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-                rect.right=pos.x+size.cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.bottom=pos.y+size.cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                rect.left=pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.top=pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+                rect.right=pos.x+size.cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.bottom=pos.y+size.cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
                 DrawEdge(hdc,&rect,EDGE_ETCHED,BF_RECT);
             }
@@ -1385 +1385 @@
 
                     DrawIcon(hdc,
-                        pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-                        pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y,
+                        pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+                        pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y,
                         (HICON)hImage);
                     DestroyIcon((HICON)hImage);
@@ -1394 +1394 @@
                     DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(0,0,0),0,0);
                     hOldFont=(HFONT)SelectObject(hdc,hFont);
-                    rect.left=pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                    rect.top=pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-                    rect.right=pos.x+size.cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                    rect.bottom=pos.y+size.cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                    rect.left=pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                    rect.top=pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+                    rect.right=pos.x+size.cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                    rect.bottom=pos.y+size.cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
                     SetTextColor(hdc,GetSysColor(COLOR_WINDOWTEXT));
                     DrawText(hdc,"icon...",-1,&rect,DT_SINGLELINE|DT_CENTER|DT_VCENTER);
@@ -1442 +1442 @@
                     SelectObject(memdc,hImage);
                     BitBlt(hdc,
-                        pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-                        pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y,
+                        pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+                        pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y,
                         size.cx, size.cy,
                         memdc, 0,0,
@@ -1454 +1454 @@
                     DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(0,0,0),0,0);
                     hOldFont=(HFONT)SelectObject(hdc,hFont);
-                    rect.left=pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                    rect.top=pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-                    rect.right=pos.x+size.cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                    rect.bottom=pos.y+size.cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                    rect.left=pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                    rect.top=pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+                    rect.right=pos.x+size.cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                    rect.bottom=pos.y+size.cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
                     SetTextColor(hdc,GetSysColor(COLOR_WINDOWTEXT));
                     DrawText(hdc,"bmp...",-1,&rect,DT_SINGLELINE|DT_CENTER|DT_VCENTER);
@@ -1606 +1606 @@
                 }
                 SetDIBitsToDevice(hdc,
-                    pos2.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-                    pos2.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y,
+                    pos2.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+                    pos2.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y,
                     pBitmapInfo->bmiHeader.biWidth, pBitmapInfo->bmiHeader.biHeight,
                     0,0,
@@ -1623 +1623 @@
             if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){
                 //キャプション テキスト
-                rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.top=pos.y+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-                rect.right=pos.x+size.cx-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-                rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                rect.left=pos.x+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.top=pos.y+1+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+                rect.right=pos.x+size.cx-2+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+                rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
 
                 if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0;
@@ -1665 +1665 @@
 
             //キャプション テキスト
-            rect.left=pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-            rect.top=pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
-            rect.right=pos.x+size.cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
-            rect.bottom=pos.y+size.cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+            rect.left=pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+            rect.top=pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
+            rect.right=pos.x+size.cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
+            rect.bottom=pos.y+size.cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
 
             //ビットを考慮してSS_LEFTを最後に検討する
@@ -1708 +1708 @@
                 size.cy-=16;
 
-                rect.left=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pos.x+(size.cx/2)-2;
-                rect.right=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pos.x+(size.cx/2)+2;
-                rect.top=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pos.y;
-                rect.bottom=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pos.y+size.cy;
+                rect.left=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pos.x+(size.cx/2)-2;
+                rect.right=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pos.x+(size.cx/2)+2;
+                rect.top=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pos.y;
+                rect.bottom=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pos.y+size.cy;
                 DrawEdge(hdc,&rect,EDGE_SUNKEN,BF_RECT);
 
@@ -1724 +1724 @@
                 if(size.cy>21) size.cy=21;
 
-                rect.left=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pos.x;
-                rect.right=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pos.x+size.cx;
-                rect.top=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pos.y+(size.cy/2)-2;
-                rect.bottom=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pos.y+(size.cy/2)+2;
+                rect.left=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pos.x;
+                rect.right=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pos.x+size.cx;
+                rect.top=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pos.y+(size.cy/2)-2;
+                rect.bottom=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pos.y+(size.cy/2)+2;
                 DrawEdge(hdc,&rect,EDGE_SUNKEN,BF_RECT);
 
@@ -1769 +1769 @@
     POINT pos;
 
-    SetBkMode(MdiInfo[WndNum].MdiRadInfo->hMemDC,TRANSPARENT);
-
-    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,GetStockObject(WHITE_BRUSH));
-    PatBlt(MdiInfo[WndNum].MdiRadInfo->hMemDC,0,0,ScreenX*2,ScreenY*2,PATCOPY);
-    SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,hOldBrush);
+    SetBkMode(MdiInfo[WndNum]->MdiRadInfo->hMemDC,TRANSPARENT);
+
+    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,GetStockObject(WHITE_BRUSH));
+    PatBlt(MdiInfo[WndNum]->MdiRadInfo->hMemDC,0,0,ScreenX*2,ScreenY*2,PATCOPY);
+    SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,hOldBrush);
 
     pos.x=LEVER_THICK;
     pos.y=LEVER_THICK;
-    DesigningWindow(WndNum,MdiInfo[WndNum].MdiRadInfo->hMemDC,&pos,pWindowInfo);
-
-    InvalidateRect(MdiInfo[WndNum].MdiRadInfo->hRad,NULL,0);
+    DesigningWindow(WndNum,MdiInfo[WndNum]->MdiRadInfo->hMemDC,&pos,pWindowInfo);
+
+    InvalidateRect(MdiInfo[WndNum]->MdiRadInfo->hRad,NULL,0);
 }

trunk/ab5.0/abdev/abdev/FileOperation.cpp

@@ -344 +344 @@
 
     char szOldTitle[MAX_PATH];
-    lstrcpy(szOldTitle,MdiInfo[WndNum].title.c_str());
-
-    if(MdiInfo[WndNum].DocType==WNDTYPE_RAD||MdiInfo[WndNum].DocType==WNDTYPE_MENU){
+    lstrcpy(szOldTitle,MdiInfo[WndNum]->title.c_str());
+
+    if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD||MdiInfo[WndNum]->DocType==WNDTYPE_MENU){
         ////////////////////////////////////
         // RADツール及びメニューエディタ
@@ -359 +359 @@
         }
     }
-    else if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    else if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         //////////////////////////
         // テキストドキュメント
@@ -376 +376 @@
 
             //ドキュメント セレクト コンボボックスから消去
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
 
             //新しいパスをセット
-            MdiInfo[WndNum].path = temporary;
+            MdiInfo[WndNum]->path = temporary;
 
             //ドキュメント セレクト コンボボックスに挿入
             _splitpath(temporary,NULL,NULL,str,str2);
             lstrcat(str,str2);
-            MdiInfo[WndNum].title = str;
-            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum].title.c_str());
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
+            MdiInfo[WndNum]->title = str;
+            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum]->title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i2,0);
 
             //MDIウィンドウのタイトルを再設定
-            SetWindowText(hChild,MdiInfo[WndNum].title.c_str());
+            SetWindowText(hChild,MdiInfo[WndNum]->title.c_str());
         }
         else{
-            if(MdiInfo[WndNum].path.empty()){
+            if(MdiInfo[WndNum]->path.empty()){
                 //"保存先のファイルを指定してください"
 get_file_path:
@@ -403 +403 @@
                 extern LPSTR HtmlFileFilter;
                 extern LPSTR TextFileFilter;
-                if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC)
+                if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC)
                     ff=DefFileFilter;
-                else if(MdiInfo[WndNum].DocType==WNDTYPE_HTML)
+                else if(MdiInfo[WndNum]->DocType==WNDTYPE_HTML)
                     ff=HtmlFileFilter;
-                else if(MdiInfo[WndNum].DocType==WNDTYPE_TEXT)
+                else if(MdiInfo[WndNum]->DocType==WNDTYPE_TEXT)
                     ff=TextFileFilter;
 
@@ -414 +414 @@
                 return 1;
             }
-            lstrcpy(temporary,MdiInfo[WndNum].path.c_str());
+            lstrcpy(temporary,MdiInfo[WndNum]->path.c_str());
         }
 
@@ -430 +430 @@
         //文字コードを復元
         char *pBuf;
-        pBuf=nkf.RestoreBuffer(MdiInfo[WndNum].pMdiTextEdit->buffer,MdiInfo[WndNum].pMdiTextEdit->iCharCode);
+        pBuf=nkf.RestoreBuffer(MdiInfo[WndNum]->pMdiTextEdit->buffer,MdiInfo[WndNum]->pMdiTextEdit->iCharCode);
 
         //改行コードを復元
-        if(MdiInfo[WndNum].pMdiTextEdit->iLfCode==LFCODE_LF) nkf.ToLF(pBuf);
-        else if(MdiInfo[WndNum].pMdiTextEdit->iLfCode==LFCODE_CR) nkf.ToCR(pBuf);
+        if(MdiInfo[WndNum]->pMdiTextEdit->iLfCode==LFCODE_LF) nkf.ToLF(pBuf);
+        else if(MdiInfo[WndNum]->pMdiTextEdit->iLfCode==LFCODE_CR) nkf.ToCR(pBuf);
 
 
@@ -454 +454 @@
 
         //変更フラグをオフにする
-        MdiInfo[WndNum].pMdiTextEdit->UnModify();
-    }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+        MdiInfo[WndNum]->pMdiTextEdit->UnModify();
+    }
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
         ///////////////////
         // ICON
@@ -471 +471 @@
             }
             CloseHandle(fh);
-            MdiInfo[WndNum].path = temporary;
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
+            MdiInfo[WndNum]->path = temporary;
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
             _splitpath(temporary,NULL,NULL,str,str2);
             lstrcat(str,str2);
-            MdiInfo[WndNum].title = str;
-            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum].title.c_str());
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
+            MdiInfo[WndNum]->title = str;
+            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum]->title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i2,0);
-            SetWindowText(hChild,MdiInfo[WndNum].title.c_str());
+            SetWindowText(hChild,MdiInfo[WndNum]->title.c_str());
         }
         else{
-            if(MdiInfo[WndNum].path.empty()){
+            if(MdiInfo[WndNum]->path.empty()){
                 //"保存先のファイルを指定してください"
                 if(!GetFilePathDialog(hOwner,temporary,IconFileFilter,STRING_FILESAVETITLE_DEFAULT,FALSE)) return 0;
@@ -489 +489 @@
                 return 1;
             }
-            lstrcpy(temporary,MdiInfo[WndNum].path.c_str());
+            lstrcpy(temporary,MdiInfo[WndNum]->path.c_str());
         }
         SaveIconFile(temporary,hChild);
 
-        MdiInfo[WndNum].MdiIconEditInfo->bModify=0;
+        MdiInfo[WndNum]->MdiIconEditInfo->bModify=0;
     }
 
@@ -502 +502 @@
         color=pobj_MainTab->GetItemColor(szOldTitle);
         pobj_MainTab->DeleteItem( szOldTitle, false );
-        pobj_MainTab->InsertItem( MdiInfo[WndNum].title.c_str(), false, color );
+        pobj_MainTab->InsertItem( MdiInfo[WndNum]->title.c_str(), false, color );
     }
     else{
-        pobj_MainTab->RenameItem( szOldTitle, MdiInfo[WndNum].title.c_str() );
+        pobj_MainTab->RenameItem( szOldTitle, MdiInfo[WndNum]->title.c_str() );
     }
 
     //「最近使ったファイル」を更新
-    pobj_nv->pobj_History->insert(MdiInfo[WndNum].path.c_str());
+    pobj_nv->pobj_History->insert(MdiInfo[WndNum]->path.c_str());
 
     return 1;

trunk/ab5.0/abdev/abdev/IconEditor.cpp

@@ -34 +34 @@
     BITMAPINFOHEADER *pBmpInfoHdr;
 
-    hCombo=GetDlgItem(MdiInfo[WndNum].MdiIconEditInfo->hToolDlg,IDC_ICONTYPECOMBO);
-
-    for(i=0;i<MdiInfo[WndNum].MdiIconEditInfo->num;i++){
-        pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[i];
+    hCombo=GetDlgItem(MdiInfo[WndNum]->MdiIconEditInfo->hToolDlg,IDC_ICONTYPECOMBO);
+
+    for(i=0;i<MdiInfo[WndNum]->MdiIconEditInfo->num;i++){
+        pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[i];
 
         //例: "32*32 (xxxx色)"
@@ -147 +147 @@
     }
 
-    MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->num]=
+    MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->num]=
         CreateIconType(IconType,
-        &MdiInfo[WndNum].MdiIconEditInfo->dwBytesInRes[MdiInfo[WndNum].MdiIconEditInfo->num]);
+        &MdiInfo[WndNum]->MdiIconEditInfo->dwBytesInRes[MdiInfo[WndNum]->MdiIconEditInfo->num]);
 
     //イメージ選択用のメモリを解放
-    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2)
-        DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-    MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
+    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2)
+        DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+    MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
 
     //アイコンタイプを追加
-    MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum=MdiInfo[WndNum].MdiIconEditInfo->num;
-    MdiInfo[WndNum].MdiIconEditInfo->num++;
+    MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum=MdiInfo[WndNum]->MdiIconEditInfo->num;
+    MdiInfo[WndNum]->MdiIconEditInfo->num++;
 
     //変更情報を初期化
-    i=MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum;
-    MdiInfo[WndNum].MdiIconEditInfo->undo[i].NowPos=0;
-    memset(MdiInfo[WndNum].MdiIconEditInfo->undo[i].lpData,0,sizeof(BYTE *)*MAX_ICONEDIT_UNDONUM);
+    i=MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum;
+    MdiInfo[WndNum]->MdiIconEditInfo->undo[i].NowPos=0;
+    memset(MdiInfo[WndNum]->MdiIconEditInfo->undo[i].lpData,0,sizeof(BYTE *)*MAX_ICONEDIT_UNDONUM);
 
     //アイコンタイプコンボボックスに追加
     char temporary[32];
     HWND hCombo;
-    hCombo=GetDlgItem(MdiInfo[WndNum].MdiIconEditInfo->hToolDlg,IDC_ICONTYPECOMBO);
+    hCombo=GetDlgItem(MdiInfo[WndNum]->MdiIconEditInfo->hToolDlg,IDC_ICONTYPECOMBO);
 
     //例: "32*32 (xxxx色)"
@@ -182 +182 @@
     //再描画
     HBRUSH hOldBrush;
-    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
-    PatBlt(MdiInfo[WndNum].MdiIconEditInfo->memdc,0,0,400,400,PATCOPY);
-    SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hOldBrush);
+    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
+    PatBlt(MdiInfo[WndNum]->MdiIconEditInfo->memdc,0,0,400,400,PATCOPY);
+    SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hOldBrush);
     DrawIconToMemBmp(WndNum,0);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,1);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hColorDlg,NULL,0);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,1);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hColorDlg,NULL,0);
 }
 void DeleteIconType(int WndNum){
@@ -194 +194 @@
     //変更情報を解放
     for(i=0;i<MAX_ICONEDIT_UNDONUM;i++){
-        if(MdiInfo[WndNum].MdiIconEditInfo->undo[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum].lpData[i])
-            HeapDefaultFree(MdiInfo[WndNum].MdiIconEditInfo->undo[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum].lpData[i]);
+        if(MdiInfo[WndNum]->MdiIconEditInfo->undo[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum].lpData[i])
+            HeapDefaultFree(MdiInfo[WndNum]->MdiIconEditInfo->undo[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum].lpData[i]);
     }
 
     //メモリを解放
-    HeapDefaultFree(MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]);
+    HeapDefaultFree(MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]);
 
     //イメージ選択用のメモリを解放
-    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2)
-        DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-    MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
+    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2)
+        DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+    MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
 
     ////////////////////////
     // アイコンタイプを削除
-    for(i=MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum;i<MdiInfo[WndNum].MdiIconEditInfo->num-1;i++){
-        MdiInfo[WndNum].MdiIconEditInfo->pIconImage[i]=MdiInfo[WndNum].MdiIconEditInfo->pIconImage[i+1];
-        MdiInfo[WndNum].MdiIconEditInfo->dwBytesInRes[i]=MdiInfo[WndNum].MdiIconEditInfo->dwBytesInRes[i+1];
-        MdiInfo[WndNum].MdiIconEditInfo->undo[i]=MdiInfo[WndNum].MdiIconEditInfo->undo[i+1];
-    }
-    MdiInfo[WndNum].MdiIconEditInfo->num--;
-    if(MdiInfo[WndNum].MdiIconEditInfo->num==MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum)
-        MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum=MdiInfo[WndNum].MdiIconEditInfo->num-1;
+    for(i=MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum;i<MdiInfo[WndNum]->MdiIconEditInfo->num-1;i++){
+        MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[i]=MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[i+1];
+        MdiInfo[WndNum]->MdiIconEditInfo->dwBytesInRes[i]=MdiInfo[WndNum]->MdiIconEditInfo->dwBytesInRes[i+1];
+        MdiInfo[WndNum]->MdiIconEditInfo->undo[i]=MdiInfo[WndNum]->MdiIconEditInfo->undo[i+1];
+    }
+    MdiInfo[WndNum]->MdiIconEditInfo->num--;
+    if(MdiInfo[WndNum]->MdiIconEditInfo->num==MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum)
+        MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum=MdiInfo[WndNum]->MdiIconEditInfo->num-1;
 
     //コンボボックスからアイコンタイプを削除
     HWND hCombo;
-    hCombo=GetDlgItem(MdiInfo[WndNum].MdiIconEditInfo->hToolDlg,IDC_ICONTYPECOMBO);
+    hCombo=GetDlgItem(MdiInfo[WndNum]->MdiIconEditInfo->hToolDlg,IDC_ICONTYPECOMBO);
     i=SendMessage(hCombo,CB_DELETESTRING,
         SendMessage(hCombo,CB_GETCURSEL,0,0),
         0);
-    SendMessage(hCombo,CB_SETCURSEL,MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum,0);
+    SendMessage(hCombo,CB_SETCURSEL,MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum,0);
 
     //再描画
     HBRUSH hOldBrush;
-    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
-    PatBlt(MdiInfo[WndNum].MdiIconEditInfo->memdc,0,0,400,400,PATCOPY);
-    SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hOldBrush);
+    hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
+    PatBlt(MdiInfo[WndNum]->MdiIconEditInfo->memdc,0,0,400,400,PATCOPY);
+    SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hOldBrush);
     DrawIconToMemBmp(WndNum,0);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,1);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hColorDlg,NULL,0);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,1);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hColorDlg,NULL,0);
 }
 void NewIconEditWindow(const char *filepath){
@@ -252 +252 @@
         while(hChild){
             i=GetWndNum(hChild);
-            if(MdiInfo[i].DocType==WNDTYPE_ICONEDIT){
-                if(lstrcmpi(MdiInfo[i].path.c_str(),filepath)==0) break;
+            if(MdiInfo[i]->DocType==WNDTYPE_ICONEDIT){
+                if(lstrcmpi(MdiInfo[i]->path.c_str(),filepath)==0) break;
             }
             hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -344 +344 @@
 
     mdic.lParam=0;
+    mdic.style |= WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
     hChild=(HWND)SendMessage(hClient,WM_MDICREATE,0,(long)&mdic);   //ウィンドウ作成
 
@@ -369 +370 @@
 
     //ウィンドウのID登録
-    MdiInfo.push_back( MDIINFO() );
+    MdiInfo.push_back( new MDIINFO() );
     i = MdiInfo.size()-1;
-    MdiInfo[i].hwnd=hChild;
-    MdiInfo[i].DocType=WNDTYPE_ICONEDIT;
-    MdiInfo[i].title = str;
+    MdiInfo[i]->hwnd=hChild;
+    MdiInfo[i]->DocType=WNDTYPE_ICONEDIT;
+    MdiInfo[i]->title = str;
     if(filepath)
     {
-        MdiInfo[i].path = filepath;
+        MdiInfo[i]->path = filepath;
     }
     else
     {
-        MdiInfo[i].path = "";
-    }
-
-    MdiInfo[i].MdiIconEditInfo=(MDIICONEDITINFO *)HeapAlloc(hHeap,0,sizeof(MDIICONEDITINFO));
-    MdiInfo[i].MdiIconEditInfo->hMain=hMain;
-    MdiInfo[i].MdiIconEditInfo->hToolDlg=hToolDlg;
-    MdiInfo[i].MdiIconEditInfo->hButtonsDlg=hButtonsDlg;
-    MdiInfo[i].MdiIconEditInfo->hColorDlg=hColorDlg;
+        MdiInfo[i]->path = "";
+    }
+
+    MdiInfo[i]->MdiIconEditInfo=(MDIICONEDITINFO *)HeapAlloc(hHeap,0,sizeof(MDIICONEDITINFO));
+    MdiInfo[i]->MdiIconEditInfo->hMain=hMain;
+    MdiInfo[i]->MdiIconEditInfo->hToolDlg=hToolDlg;
+    MdiInfo[i]->MdiIconEditInfo->hButtonsDlg=hButtonsDlg;
+    MdiInfo[i]->MdiIconEditInfo->hColorDlg=hColorDlg;
     hdc=GetDC(hMain);
-    MdiInfo[i].MdiIconEditInfo->memdc=CreateCompatibleDC(hdc);
-    MdiInfo[i].MdiIconEditInfo->hMemBmp=CreateCompatibleBitmap(hdc,600,400);
-    SelectObject(MdiInfo[i].MdiIconEditInfo->memdc,MdiInfo[i].MdiIconEditInfo->hMemBmp);
+    MdiInfo[i]->MdiIconEditInfo->memdc=CreateCompatibleDC(hdc);
+    MdiInfo[i]->MdiIconEditInfo->hMemBmp=CreateCompatibleBitmap(hdc,600,400);
+    SelectObject(MdiInfo[i]->MdiIconEditInfo->memdc,MdiInfo[i]->MdiIconEditInfo->hMemBmp);
     ReleaseDC(hMain,hdc);
 
-    MdiInfo[i].MdiIconEditInfo->SelectLevel=0;
-
-    MdiInfo[i].MdiIconEditInfo->num=IconNum;
-    MdiInfo[i].MdiIconEditInfo->SelectIconNum=0;
-    memcpy(MdiInfo[i].MdiIconEditInfo->pIconImage,pImageBuffer,sizeof(DWORD)*IconNum);
-
-    memcpy(MdiInfo[i].MdiIconEditInfo->dwBytesInRes,dwBytesInRes,sizeof(DWORD)*IconNum);
-
-    MdiInfo[i].MdiIconEditInfo->NowTool=IDC_TOOL_PEN;
-    MdiInfo[i].MdiIconEditInfo->MainColor=RGB(0,0,0);
+    MdiInfo[i]->MdiIconEditInfo->SelectLevel=0;
+
+    MdiInfo[i]->MdiIconEditInfo->num=IconNum;
+    MdiInfo[i]->MdiIconEditInfo->SelectIconNum=0;
+    memcpy(MdiInfo[i]->MdiIconEditInfo->pIconImage,pImageBuffer,sizeof(DWORD)*IconNum);
+
+    memcpy(MdiInfo[i]->MdiIconEditInfo->dwBytesInRes,dwBytesInRes,sizeof(DWORD)*IconNum);
+
+    MdiInfo[i]->MdiIconEditInfo->NowTool=IDC_TOOL_PEN;
+    MdiInfo[i]->MdiIconEditInfo->MainColor=RGB(0,0,0);
     extern COLORREF TransparentClrRef;
-    MdiInfo[i].MdiIconEditInfo->SubColor=TransparentClrRef;
-
-    for(i2=0;i2<MdiInfo[i].MdiIconEditInfo->num;i2++){
-        MdiInfo[i].MdiIconEditInfo->undo[i2].NowPos=0;
-        memset(MdiInfo[i].MdiIconEditInfo->undo[i2].lpData,0,sizeof(BYTE *)*MAX_ICONEDIT_UNDONUM);
-    }
-    MdiInfo[i].MdiIconEditInfo->bModify=0;
+    MdiInfo[i]->MdiIconEditInfo->SubColor=TransparentClrRef;
+
+    for(i2=0;i2<MdiInfo[i]->MdiIconEditInfo->num;i2++){
+        MdiInfo[i]->MdiIconEditInfo->undo[i2].NowPos=0;
+        memset(MdiInfo[i]->MdiIconEditInfo->undo[i2].lpData,0,sizeof(BYTE *)*MAX_ICONEDIT_UNDONUM);
+    }
+    MdiInfo[i]->MdiIconEditInfo->bModify=0;
 
 
@@ -417 +418 @@
     //メモリへ初期描画を行う
     HBRUSH hOldBrush;
-    hOldBrush=(HBRUSH)SelectObject(MdiInfo[i].MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
-    PatBlt(MdiInfo[i].MdiIconEditInfo->memdc,0,0,600,400,PATCOPY);
-    SelectObject(MdiInfo[i].MdiIconEditInfo->memdc,hOldBrush);
+    hOldBrush=(HBRUSH)SelectObject(MdiInfo[i]->MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
+    PatBlt(MdiInfo[i]->MdiIconEditInfo->memdc,0,0,600,400,PATCOPY);
+    SelectObject(MdiInfo[i]->MdiIconEditInfo->memdc,hOldBrush);
     DrawIconToMemBmp(i,0);
 
@@ -430 +431 @@
     ResetIconType(i);
 
-    if(MdiInfo[i].MdiIconEditInfo->num<=1)
+    if(MdiInfo[i]->MdiIconEditInfo->num<=1)
         EnableWindow(GetDlgItem(hToolDlg,IDC_DELETE_ICONTYPE),0);
 
@@ -460 +461 @@
     *((WORD *)(buffer+i2))=1;   //idType
     i2+=sizeof(WORD);
-    *((WORD *)(buffer+i2))=MdiInfo[WndNum].MdiIconEditInfo->num;    //idCount
+    *((WORD *)(buffer+i2))=MdiInfo[WndNum]->MdiIconEditInfo->num;   //idCount
     i2+=sizeof(WORD);
 
@@ -470 +471 @@
     //イメージバッファの初期位置
     IconDirEntry.dwImageOffset=sizeof(ICONDIR)+
-        sizeof(ICONDIRENTRY)*MdiInfo[WndNum].MdiIconEditInfo->num;
-
-    for(i=0;i<MdiInfo[WndNum].MdiIconEditInfo->num;i++){
+        sizeof(ICONDIRENTRY)*MdiInfo[WndNum]->MdiIconEditInfo->num;
+
+    for(i=0;i<MdiInfo[WndNum]->MdiIconEditInfo->num;i++){
         BITMAPINFOHEADER *pBmpInfoHdr;
-        pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[i];
+        pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[i];
 
         IconDirEntry.bWidth=(BYTE)pBmpInfoHdr->biWidth;
@@ -505 +506 @@
     ////////////////////
     // イメージバッファ
-    for(i=0;i<MdiInfo[WndNum].MdiIconEditInfo->num;i++){
+    for(i=0;i<MdiInfo[WndNum]->MdiIconEditInfo->num;i++){
         memcpy(buffer+i2,
-            MdiInfo[WndNum].MdiIconEditInfo->pIconImage[i],
+            MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[i],
             ImgBufSize[i]);
 
@@ -538 +539 @@
             if(i==-1) return 0; //ウィンドウが初期状態の場合
 
-            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i].title.c_str());
+            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i,0);
             SetStatusText(NULL);
@@ -546 +547 @@
             WndNum=GetWndNum(hwnd);
             if(WndNum==-1) break;
-            ResizeIconWindow(MdiInfo[WndNum].MdiIconEditInfo->hMain,
-                MdiInfo[WndNum].MdiIconEditInfo->hToolDlg,
-                MdiInfo[WndNum].MdiIconEditInfo->hColorDlg,
+            ResizeIconWindow(MdiInfo[WndNum]->MdiIconEditInfo->hMain,
+                MdiInfo[WndNum]->MdiIconEditInfo->hToolDlg,
+                MdiInfo[WndNum]->MdiIconEditInfo->hColorDlg,
                 LOWORD(lParam),HIWORD(lParam));
             break;

trunk/ab5.0/abdev/abdev/IconEditor_Color.cpp

@@ -31 +31 @@
                 //透明色をクリックした場合
                 if(message==WM_LBUTTONDOWN)
-                    MdiInfo[WndNum].MdiIconEditInfo->MainColor=TransparentClrRef;
+                    MdiInfo[WndNum]->MdiIconEditInfo->MainColor=TransparentClrRef;
                 else
-                    MdiInfo[WndNum].MdiIconEditInfo->SubColor=TransparentClrRef;
+                    MdiInfo[WndNum]->MdiIconEditInfo->SubColor=TransparentClrRef;
                 InvalidateRect(hwnd,NULL,0);
                 return 1;
@@ -52 +52 @@
 
             if(message==WM_LBUTTONDOWN)
-                MdiInfo[WndNum].MdiIconEditInfo->MainColor=ColorRef;
+                MdiInfo[WndNum]->MdiIconEditInfo->MainColor=ColorRef;
             else
-                MdiInfo[WndNum].MdiIconEditInfo->SubColor=ColorRef;
+                MdiInfo[WndNum]->MdiIconEditInfo->SubColor=ColorRef;
 
             InvalidateRect(hwnd,NULL,0);
@@ -78 +78 @@
 
             //カラーテーブルを取得
-            pRgbq=(RGBQUAD *)(MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
+            pRgbq=(RGBQUAD *)(MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
 
             hdc=BeginPaint(hwnd,&ps);
             hPen=CreatePen(PS_SOLID,0,RGB(0,0,0));
             hOldPen=(HPEN)SelectObject(hdc,hPen);
-            if(MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biBitCount==4){
+            if(MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biBitCount==4){
                 ////////
                 // 16色
@@ -154 +154 @@
 
             //現在選択中のサブカラーを表示
-            hBrush=CreateSolidBrush(MdiInfo[WndNum].MdiIconEditInfo->SubColor);
+            hBrush=CreateSolidBrush(MdiInfo[WndNum]->MdiIconEditInfo->SubColor);
             hOldBrush=(HBRUSH)SelectObject(hdc,hBrush);
             Rectangle(hdc,
@@ -165 +165 @@
 
             //現在選択中のメインカラーを表示
-            hBrush=CreateSolidBrush(MdiInfo[WndNum].MdiIconEditInfo->MainColor);
+            hBrush=CreateSolidBrush(MdiInfo[WndNum]->MdiIconEditInfo->MainColor);
             hOldBrush=(HBRUSH)SelectObject(hdc,hBrush);
             Rectangle(hdc,

trunk/ab5.0/abdev/abdev/IconEditor_Main.cpp

@@ -15 +15 @@
     if(pRect->left<0) pRect->left=0;
     if(pRect->top<0) pRect->top=0;
-    if(pRect->left>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth)
-        pRect->left=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth-1;
-    if(pRect->top>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2)
-        pRect->top=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2-1;
+    if(pRect->left>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth)
+        pRect->left=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth-1;
+    if(pRect->top>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2)
+        pRect->top=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2-1;
 
     if(pRect->right<0) pRect->right=0;
     if(pRect->bottom<0) pRect->bottom=0;
-    if(pRect->right>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth)
-        pRect->right=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth-1;
-    if(pRect->bottom>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2)
-        pRect->bottom=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2-1;
+    if(pRect->right>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth)
+        pRect->right=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth-1;
+    if(pRect->bottom>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2)
+        pRect->bottom=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2-1;
 }
 void GetZoomedPos(POINT *pPos){
@@ -35 +35 @@
 
     if(x<0||y<0||
-        x>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth||
-        y>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2)
+        x>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth||
+        y>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2)
         return;
 
@@ -52 +52 @@
 
     //カラーテーブルを取得
-    pRgbq=(RGBQUAD *)(MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
-
-    i2=(int)pow((double)2,(double)MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biBitCount);
+    pRgbq=(RGBQUAD *)(MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
+
+    i2=(int)pow((double)2,(double)MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biBitCount);
     for(i=0;i<i2;i++){
         if(ColorRef==RGB(pRgbq[i].rgbRed,pRgbq[i].rgbGreen,pRgbq[i].rgbBlue)) break;
@@ -74 +74 @@
     //何も選択されていない場合は0を返す
     sw=0;
-    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==0) return 0;
-    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==1){
+    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==0) return 0;
+    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==1){
         IconEdit_SelectImage(WndNum);
         sw=1;
     }
 
-    size.cx=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left+1;
-    size.cy=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top+1;
-
-    hDC=CreateCompatibleDC(MdiInfo[WndNum].MdiIconEditInfo->memdc);
+    size.cx=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left+1;
+    size.cy=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top+1;
+
+    hDC=CreateCompatibleDC(MdiInfo[WndNum]->MdiIconEditInfo->memdc);
     hBmp=CreateCompatibleBitmap(
-        MdiInfo[WndNum].MdiIconEditInfo->memdc,
+        MdiInfo[WndNum]->MdiIconEditInfo->memdc,
         size.cx,
         size.cy);
@@ -91 +91 @@
 
     BitBlt(hDC,0,0,size.cx,size.cy,
-        MdiInfo[WndNum].MdiIconEditInfo->memdc,
-        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left,
-        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top,
+        MdiInfo[WndNum]->MdiIconEditInfo->memdc,
+        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left,
+        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top,
         SRCCOPY);
 
@@ -99 +99 @@
 
     if(sw){
-        DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-        MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=1;
+        DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+        MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=1;
     }
 
@@ -113 +113 @@
     BITMAP Bitmap;
 
-    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2)
+    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2)
         IconEdit_PasteImage(WndNum);
 
     GetObject(hBmp,sizeof(Bitmap),&Bitmap);
 
-    hDC=CreateCompatibleDC(MdiInfo[WndNum].MdiIconEditInfo->memdc);
-    MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp=
-        CreateCompatibleBitmap(MdiInfo[WndNum].MdiIconEditInfo->memdc,Bitmap.bmWidth,Bitmap.bmHeight);
-    SelectObject(hDC,MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-    hDC2=CreateCompatibleDC(MdiInfo[WndNum].MdiIconEditInfo->memdc);
+    hDC=CreateCompatibleDC(MdiInfo[WndNum]->MdiIconEditInfo->memdc);
+    MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp=
+        CreateCompatibleBitmap(MdiInfo[WndNum]->MdiIconEditInfo->memdc,Bitmap.bmWidth,Bitmap.bmHeight);
+    SelectObject(hDC,MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+    hDC2=CreateCompatibleDC(MdiInfo[WndNum]->MdiIconEditInfo->memdc);
     SelectObject(hDC2,hBmp);
 
@@ -131 +131 @@
     DeleteDC(hDC2);
 
-    MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left=0;
-    MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top=0;
-    MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right=Bitmap.bmWidth-1;
-    MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom=Bitmap.bmHeight-1;
-
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,0);
-
-    MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=2;
+    MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left=0;
+    MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top=0;
+    MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right=Bitmap.bmWidth-1;
+    MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom=Bitmap.bmHeight-1;
+
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,0);
+
+    MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=2;
 }
 
@@ -145 +145 @@
     HDC hDC;
 
-    size.cx=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left+1;
-    size.cy=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top+1;
-
-    hDC=CreateCompatibleDC(MdiInfo[WndNum].MdiIconEditInfo->memdc);
-    MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp=
-        CreateCompatibleBitmap(MdiInfo[WndNum].MdiIconEditInfo->memdc,size.cx,size.cy);
-    SelectObject(hDC,MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
+    size.cx=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left+1;
+    size.cy=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top+1;
+
+    hDC=CreateCompatibleDC(MdiInfo[WndNum]->MdiIconEditInfo->memdc);
+    MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp=
+        CreateCompatibleBitmap(MdiInfo[WndNum]->MdiIconEditInfo->memdc,size.cx,size.cy);
+    SelectObject(hDC,MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
     BitBlt(hDC,0,0,size.cx,size.cy,
-        MdiInfo[WndNum].MdiIconEditInfo->memdc,
-        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left,
-        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top,
+        MdiInfo[WndNum]->MdiIconEditInfo->memdc,
+        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left,
+        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top,
         SRCCOPY);
     DeleteDC(hDC);
 
-    MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=2;
+    MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=2;
 }
 void IconEdit_PasteImage(int WndNum){
@@ -179 +179 @@
     IconEdit_NoticeChanging(WndNum);
 
-    GetObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp,sizeof(BITMAP),&Bitmap);
+    GetObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp,sizeof(BITMAP),&Bitmap);
     pSelectingBuffer=(COLORREF *)HeapAlloc(hHeap,0,Bitmap.bmWidth*Bitmap.bmHeight*sizeof(COLORREF));
     SelectingBitmapInfo.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
@@ -187 +187 @@
     SelectingBitmapInfo.bmiHeader.biBitCount=32;
     SelectingBitmapInfo.bmiHeader.biCompression=BI_RGB;
-    GetDIBits(MdiInfo[WndNum].MdiIconEditInfo->memdc,
-        MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp,
+    GetDIBits(MdiInfo[WndNum]->MdiIconEditInfo->memdc,
+        MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp,
         0,Bitmap.bmHeight,
         pSelectingBuffer,&SelectingBitmapInfo,DIB_RGB_COLORS);
 
-    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
 
     //カラーテーブルを取得
-    pRgbq=(RGBQUAD *)(MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
+    pRgbq=(RGBQUAD *)(MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
 
     //ビットバッファを取得
-    pBuffer=MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+
+    pBuffer=MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+
         sizeof(BITMAPINFOHEADER);
     if(pBmpInfoHdr->biBitCount<=8)
@@ -206 +206 @@
     pMaskBuf=pBuffer+pBmpInfoHdr->biBitCount*pBmpInfoHdr->biWidth*(pBmpInfoHdr->biHeight/2)/8;
 
-    for(y=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom;y>=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top;y--){
-        for(x=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left;x<=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right;x++){
+    for(y=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom;y>=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top;y--){
+        for(x=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left;x<=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right;x++){
             if(x<0||y<0||
-                x>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth||
-                y>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2){
+                x>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth||
+                y>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2){
                 //範囲外の場合
                 continue;
             }
 
-            selecting_x=x-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left;
-            selecting_y=y-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top;
+            selecting_x=x-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left;
+            selecting_y=y-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top;
             dwRgbq=pSelectingBuffer[(Bitmap.bmHeight-1-selecting_y)*Bitmap.bmWidth+selecting_x];
 
@@ -284 +284 @@
     HeapDefaultFree(pSelectingBuffer);
 
-    DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-    MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
+    DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+    MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
 
     DrawIconToMemBmp(WndNum,0);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,0);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,0);
 }
 
@@ -301 +301 @@
     BITMAPINFOHEADER *pBmpInfoHdr;
 
-    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
 
     if( !(pBmpInfoHdr->biBitCount == 4 || pBmpInfoHdr->biBitCount == 8 ) ){
@@ -310 +310 @@
 
     hPen=CreatePen(PS_SOLID,0,RGB(200,200,200));
-    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hPen);
+    hOldPen=(HPEN)SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hPen);
 
     //カラーテーブルを取得
-    pRgbq=(RGBQUAD *)(MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
+    pRgbq=(RGBQUAD *)(MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
 
     //ビットバッファを取得
-    pBuffer=MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+
+    pBuffer=MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+
         sizeof(BITMAPINFOHEADER);
     if(pBmpInfoHdr->biBitCount<=8)
@@ -344 +344 @@
             if(i2){
                 hBrush=CreateSolidBrush(TransparentClrRef);
-                hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hBrush);
+                hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hBrush);
                 pos.x=x;
                 pos.y=y;
                 GetZoomedPos(&pos);
-                Rectangle(MdiInfo[WndNum].MdiIconEditInfo->memdc,
+                Rectangle(MdiInfo[WndNum]->MdiIconEditInfo->memdc,
                     pos.x,
                     pos.y,
                     pos.x+11,
                     pos.y+11);
-                SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hOldBrush);
+                SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hOldBrush);
                 DeleteObject(hBrush);
 
-                SetPixel(MdiInfo[WndNum].MdiIconEditInfo->memdc,x,y,TransparentClrRef);
+                SetPixel(MdiInfo[WndNum]->MdiIconEditInfo->memdc,x,y,TransparentClrRef);
                 continue;
             }
@@ -377 +377 @@
 
             hBrush=CreateSolidBrush(ColorRef);
-            hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hBrush);
+            hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hBrush);
             pos.x=x;
             pos.y=y;
             GetZoomedPos(&pos);
-            Rectangle(MdiInfo[WndNum].MdiIconEditInfo->memdc,
+            Rectangle(MdiInfo[WndNum]->MdiIconEditInfo->memdc,
                 pos.x,
                 pos.y,
                 pos.x+11,
                 pos.y+11);
-            SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hOldBrush);
+            SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hOldBrush);
             DeleteObject(hBrush);
 
-            SetPixel(MdiInfo[WndNum].MdiIconEditInfo->memdc,x,y,ColorRef);
-        }
-    }
-
-    SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hOldPen);
+            SetPixel(MdiInfo[WndNum]->MdiIconEditInfo->memdc,x,y,ColorRef);
+        }
+    }
+
+    SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hOldPen);
     DeleteObject(hPen);
 }
@@ -404 +404 @@
 
     if(x<0||y<0) return;
-    if(x>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth||
-        y>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2)
+    if(x>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth||
+        y>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2)
         return;
 
-    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
-
-    pBuffer=MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+
+    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
+
+    pBuffer=MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+
         sizeof(BITMAPINFOHEADER);
     pBuffer+=sizeof(DWORD)*(int)pow((double)2,(double)pBmpInfoHdr->biBitCount);
@@ -466 +466 @@
 
     if(x<0||y<0) return 0;
-    if(x>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth||
-        y>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2)
+    if(x>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth||
+        y>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2)
         return 0;
 
-    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
 
     //カラーテーブルを取得
-    pRgbq=(RGBQUAD *)(MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
+    pRgbq=(RGBQUAD *)(MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+sizeof(BITMAPINFOHEADER));
 
     //通常バッファを取得
-    pBuffer=MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]+
+    pBuffer=MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]+
         sizeof(BITMAPINFOHEADER)+
         sizeof(DWORD)*(int)pow((double)2,(double)pBmpInfoHdr->biBitCount);
@@ -567 +567 @@
 
     if(x<0||y<0) return;
-    if(x>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biWidth||
-        y>=MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]->biHeight/2)
+    if(x>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biWidth||
+        y>=MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]->biHeight/2)
         return;
 
@@ -676 +676 @@
         pRect->right,
         pRect->bottom,
-        GetColorCode(WndNum,MdiInfo[WndNum].MdiIconEditInfo->SubColor),
-        GetColorCode(WndNum,MdiInfo[WndNum].MdiIconEditInfo->SubColor),1);
+        GetColorCode(WndNum,MdiInfo[WndNum]->MdiIconEditInfo->SubColor),
+        GetColorCode(WndNum,MdiInfo[WndNum]->MdiIconEditInfo->SubColor),1);
 
     DrawIconToMemBmp(WndNum,0);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,0);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,0);
 }
 
@@ -697 +697 @@
     //以前の選択フレームを消去
     BITMAPINFOHEADER *pBmpInfoHdr;
-    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+    pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
     pos.x=pBmpInfoHdr->biWidth;
     pos.y=pBmpInfoHdr->biHeight/2;
     GetZoomedPos(&pos);
-    BitBlt(hdc,0,0,pos.x,pos.y,MdiInfo[WndNum].MdiIconEditInfo->memdc,0,0,SRCCOPY);
+    BitBlt(hdc,0,0,pos.x,pos.y,MdiInfo[WndNum]->MdiIconEditInfo->memdc,0,0,SRCCOPY);
 
 
@@ -735 +735 @@
     RECT rect;
 
-    rect.left=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left*PIXEL_WIDTH+ZOOMED_XPOS;
-    rect.top=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top*PIXEL_WIDTH;
-    rect.right=(MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right+1)*PIXEL_WIDTH+ZOOMED_XPOS+1;
-    rect.bottom=(MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom+1)*PIXEL_WIDTH+1;
+    rect.left=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left*PIXEL_WIDTH+ZOOMED_XPOS;
+    rect.top=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top*PIXEL_WIDTH;
+    rect.right=(MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right+1)*PIXEL_WIDTH+ZOOMED_XPOS+1;
+    rect.bottom=(MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom+1)*PIXEL_WIDTH+1;
 
     SetBkMode(hdc,TRANSPARENT);
@@ -810 +810 @@
     COLORREF *pSelectingBuffer;
 
-    GetObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp,sizeof(BITMAP),&Bitmap);
+    GetObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp,sizeof(BITMAP),&Bitmap);
     pSelectingBuffer=(COLORREF *)HeapAlloc(hHeap,0,Bitmap.bmWidth*Bitmap.bmHeight*sizeof(COLORREF));
     SelectingBitmapInfo.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
@@ -818 +818 @@
     SelectingBitmapInfo.bmiHeader.biBitCount=32;
     SelectingBitmapInfo.bmiHeader.biCompression=BI_RGB;
-    GetDIBits(MdiInfo[WndNum].MdiIconEditInfo->memdc,
-        MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp,
+    GetDIBits(MdiInfo[WndNum]->MdiIconEditInfo->memdc,
+        MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp,
         0,Bitmap.bmHeight,
         pSelectingBuffer,&SelectingBitmapInfo,DIB_RGB_COLORS);
@@ -855 +855 @@
     RECT rect;
 
-    pos.x=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left;
-    pos.y=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top;
+    pos.x=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left;
+    pos.y=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top;
     GetZoomedPos(&pos);
     rect.left=pos.x;
     rect.top=pos.y;
-    pos.x=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right+1;
-    pos.y=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom+1;
+    pos.x=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right+1;
+    pos.y=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom+1;
     GetZoomedPos(&pos);
     rect.right=pos.x;
@@ -878 +878 @@
     POINT pos;
 
-    size.cx=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left;
-    size.cy=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom-MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top;
-    hDC2=CreateCompatibleDC(MdiInfo[WndNum].MdiIconEditInfo->memdc);
-    SelectObject(hDC2,MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
+    size.cx=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left;
+    size.cy=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom-MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top;
+    hDC2=CreateCompatibleDC(MdiInfo[WndNum]->MdiIconEditInfo->memdc);
+    SelectObject(hDC2,MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
     BitBlt(hdc,
-        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left,
-        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top,
+        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left,
+        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top,
         size.cx,size.cy,
         hDC2,0,0,SRCCOPY);
@@ -890 +890 @@
 
     //拡大選択イメージを表示
-    pos.x=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left;
-    pos.y=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top;
+    pos.x=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left;
+    pos.y=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top;
     DrawZoomedBitmap(hdc,WndNum,&pos);
 }
@@ -1140 +1140 @@
             if(message==WM_LBUTTONDOWN){
                 dwDrag=1;
-                MainClrRef=MdiInfo[WndNum].MdiIconEditInfo->MainColor;
-                SubClrRef=MdiInfo[WndNum].MdiIconEditInfo->SubColor;
+                MainClrRef=MdiInfo[WndNum]->MdiIconEditInfo->MainColor;
+                SubClrRef=MdiInfo[WndNum]->MdiIconEditInfo->SubColor;
             }
             else{
                 dwDrag=2;
-                MainClrRef=MdiInfo[WndNum].MdiIconEditInfo->SubColor;
-                SubClrRef=MdiInfo[WndNum].MdiIconEditInfo->MainColor;
-            }
-
-            if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
+                MainClrRef=MdiInfo[WndNum]->MdiIconEditInfo->SubColor;
+                SubClrRef=MdiInfo[WndNum]->MdiIconEditInfo->MainColor;
+            }
+
+            if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
                 if(dwDrag==2){
                     dwDrag=0;
@@ -1156 +1156 @@
                 }
 
-                if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel){
+                if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel){
                     NowDragging=IconEdit_GetStateOfDraggingFrame(WndNum,LOWORD(lParam),HIWORD(lParam));
                     if(NowDragging==0){
-                        if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==1){
-                            MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
+                        if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==1){
+                            MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
                             InvalidateRect(hwnd,NULL,0);
                         }
-                        else if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2)
+                        else if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2)
                             IconEdit_PasteImage(WndNum);
 
@@ -1169 +1169 @@
                     }
                     else if(NowDragging==FRAME_INSIDE){
-                        if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==1){
+                        if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==1){
                             IconEdit_SelectImage(WndNum);
-                            IconEdit_EraseRect(WndNum,&MdiInfo[WndNum].MdiIconEditInfo->DraggingRect);
+                            IconEdit_EraseRect(WndNum,&MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect);
                         }
 
-                        OldRect=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect;
+                        OldRect=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect;
                     }
                 }
@@ -1185 +1185 @@
                 InvalidateRect(hwnd,NULL,0);
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_PEN){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_PEN){
                 //変更情報
                 IconEdit_NoticeChanging(WndNum);
@@ -1201 +1201 @@
                 SetCursor(LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_PEN)));
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILL){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILL){
                 //変更情報
                 IconEdit_NoticeChanging(WndNum);
@@ -1216 +1216 @@
                 SetCursor(LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_FILL)));
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_LINE||
-                MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE||
-                MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT||
-                MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2||
-                MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE||
+                MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE||
+                MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT||
+                MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2||
+                MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
                 hdc=GetDC(hwnd);
                 TempLine(hdc,WndNum,pos.x,pos.y,pos.x,pos.y,MainClrRef);
@@ -1242 +1242 @@
 
             if(dwDrag==1){
-                MainClrRef=MdiInfo[WndNum].MdiIconEditInfo->MainColor;
-                SubClrRef=MdiInfo[WndNum].MdiIconEditInfo->SubColor;
+                MainClrRef=MdiInfo[WndNum]->MdiIconEditInfo->MainColor;
+                SubClrRef=MdiInfo[WndNum]->MdiIconEditInfo->SubColor;
             }
             else{
-                MainClrRef=MdiInfo[WndNum].MdiIconEditInfo->SubColor;
-                SubClrRef=MdiInfo[WndNum].MdiIconEditInfo->MainColor;
+                MainClrRef=MdiInfo[WndNum]->MdiIconEditInfo->SubColor;
+                SubClrRef=MdiInfo[WndNum]->MdiIconEditInfo->MainColor;
             }
 
@@ -1254 +1254 @@
 
             bRedrawMemBmp=0;
-            if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
+            if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
                 if(NowDragging==SELECTING_FRAME){
                     if(LastPos.x==pos.x&&LastPos.y==pos.y){
@@ -1265 +1265 @@
                     rect.bottom=pos.y;
 
-                    RectNaturalFormat(&rect,&MdiInfo[WndNum].MdiIconEditInfo->DraggingRect);
-                    LimitRectFormat(WndNum,&MdiInfo[WndNum].MdiIconEditInfo->DraggingRect);
-                    MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=1;
+                    RectNaturalFormat(&rect,&MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect);
+                    LimitRectFormat(WndNum,&MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect);
+                    MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=1;
                     InvalidateRect(hwnd,NULL,0);
                 }
@@ -1273 +1273 @@
                     InvalidateRect(hwnd,NULL,0);
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_LINE){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE){
                 //変更情報
                 IconEdit_NoticeChanging(WndNum);
@@ -1281 +1281 @@
                 bRedrawMemBmp=1;
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE){
                 //変更情報
                 IconEdit_NoticeChanging(WndNum);
@@ -1289 +1289 @@
                 bRedrawMemBmp=1;
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT){
                 //変更情報
                 IconEdit_NoticeChanging(WndNum);
@@ -1299 +1299 @@
                 bRedrawMemBmp=1;
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2){
                 //変更情報
                 IconEdit_NoticeChanging(WndNum);
@@ -1309 +1309 @@
                 bRedrawMemBmp=1;
             }
-            else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
+            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
                 //変更情報
                 IconEdit_NoticeChanging(WndNum);
@@ -1337 +1337 @@
 
             if(dwDrag==1){
-                MainClrRef=MdiInfo[WndNum].MdiIconEditInfo->MainColor;
-                SubClrRef=MdiInfo[WndNum].MdiIconEditInfo->SubColor;
+                MainClrRef=MdiInfo[WndNum]->MdiIconEditInfo->MainColor;
+                SubClrRef=MdiInfo[WndNum]->MdiIconEditInfo->SubColor;
             }
             else{
-                MainClrRef=MdiInfo[WndNum].MdiIconEditInfo->SubColor;
-                SubClrRef=MdiInfo[WndNum].MdiIconEditInfo->MainColor;
+                MainClrRef=MdiInfo[WndNum]->MdiIconEditInfo->SubColor;
+                SubClrRef=MdiInfo[WndNum]->MdiIconEditInfo->MainColor;
             }
 
             if(dwDrag){
-                if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
+                if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
                     if(NowDragging==SELECTING_FRAME){
                         //範囲選択中
@@ -1361 +1361 @@
                         dx=pos.x-LastPos.x;
                         dy=pos.y-LastPos.y;
-                        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left+=dx;
-                        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right+=dx;
-                        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top+=dy;
-                        MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom+=dy;
+                        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left+=dx;
+                        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right+=dx;
+                        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top+=dy;
+                        MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom+=dy;
                         LastPos=pos;
 
@@ -1376 +1376 @@
 
                         hRgn=CreateRectRgnIndirect(&OldRect);
-                        hRgn2=CreateRectRgnIndirect(&MdiInfo[WndNum].MdiIconEditInfo->DraggingRect);
+                        hRgn2=CreateRectRgnIndirect(&MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect);
                         CombineRgn(hRgn,hRgn,hRgn2,RGN_XOR);
                         DeleteObject(hRgn2);
@@ -1394 +1394 @@
                         DeleteObject(hRgn2);
 
-                        p2.x=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.left;
-                        p2.y=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.top;
+                        p2.x=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.left;
+                        p2.y=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.top;
                         GetZoomedPos(&p2);
                         rect.left=p2.x;
                         rect.top=p2.y;
-                        p2.x=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.right;
-                        p2.y=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect.bottom;
+                        p2.x=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.right;
+                        p2.y=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect.bottom;
                         GetZoomedPos(&p2);
                         rect.right=p2.x+1;
@@ -1415 +1415 @@
                         ReleaseDC(hwnd,hdc);
 
-                        OldRect=MdiInfo[WndNum].MdiIconEditInfo->DraggingRect;
+                        OldRect=MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect;
                     }
                 }
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_PEN){
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_PEN){
                     if(abs(pos.x-LastPos.x)>1||abs(pos.y-LastPos.y)>1){
                         IconEdit_DrawLine(WndNum,LastPos.x,LastPos.y,pos.x,pos.y,GetColorCode(WndNum,MainClrRef));
@@ -1442 +1442 @@
                     LastPos=pos;
                 }
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_LINE){
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE){
                     InvalidateRect(hwnd,NULL,0);
                     UpdateWindow(hwnd);
@@ -1450 +1450 @@
                     ReleaseDC(hwnd,hdc);
                 }
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE){
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE){
                     InvalidateRect(hwnd,NULL,0);
                     UpdateWindow(hwnd);
@@ -1458 +1458 @@
                     ReleaseDC(hwnd,hdc);
                 }
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT){
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT){
                     InvalidateRect(hwnd,NULL,0);
                     UpdateWindow(hwnd);
@@ -1468 +1468 @@
                     ReleaseDC(hwnd,hdc);
                 }
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2){
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2){
                     InvalidateRect(hwnd,NULL,0);
                     UpdateWindow(hwnd);
@@ -1478 +1478 @@
                     ReleaseDC(hwnd,hdc);
                 }
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
                     InvalidateRect(hwnd,NULL,0);
                     UpdateWindow(hwnd);
@@ -1489 +1489 @@
             else{
                 //ドラッグ中でないとき
-                if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
-                    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel)
+                if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
+                    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel)
                         SetCursorByState(IconEdit_GetStateOfDraggingFrame(WndNum,LOWORD(lParam),HIWORD(lParam)));
                     else
                         SetCursor(LoadCursor(NULL,IDC_CROSS));
                 }
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_PEN)
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_PEN)
                     SetCursor(LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_PEN)));
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILL)
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILL)
                     SetCursor(LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_FILL)));
-                else if(MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_LINE||
-                    MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE||
-                    MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT||
-                    MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2||
-                    MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
+                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE||
+                    MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE||
+                    MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT||
+                    MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILLRECT2||
+                    MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_ELLIPSE){
                     SetCursor(LoadCursor(NULL,IDC_CROSS));
                 }
@@ -1512 +1512 @@
                 case VK_ESCAPE:
                     WndNum=GetWndNum(GetParent(hwnd));
-                    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2){
-                        DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-                        MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
+                    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2){
+                        DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+                        MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
                     }
                     InvalidateRect(hwnd,NULL,0);
@@ -1526 +1526 @@
             WndNum=GetWndNum(GetParent(hwnd));
             BITMAPINFOHEADER *pBmpInfoHdr;
-            pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+            pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
 
             hdc=BeginPaint(hwnd,&ps);
@@ -1537 +1537 @@
                 size.cx,
                 size.cy,
-                MdiInfo[WndNum].MdiIconEditInfo->memdc,0,0,SRCCOPY);
+                MdiInfo[WndNum]->MdiIconEditInfo->memdc,0,0,SRCCOPY);
 
             HBRUSH hOldBrush;
@@ -1550 +1550 @@
                 PATCOPY);
 
-            if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==1)
+            if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==1)
                 IconEdit_DrawSelectingRect(hdc,WndNum);
-            if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2){
+            if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2){
                 DrawSelectingImage(hdc,WndNum);
                 if(dwDrag==0) IconEdit_DrawSelectingRect(hdc,WndNum);

trunk/ab5.0/abdev/abdev/IconEditor_Tool.cpp

@@ -80 +80 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(LOWORD(wParam)!=IDC_TOOL_SELECT&&
-                        MdiInfo[WndNum].MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
-                        MdiInfo[WndNum].MdiIconEditInfo->NowTool=LOWORD(wParam);
-                        if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel){
-                            if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2)
-                                DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-                            MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
+                        MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_SELECT){
+                        MdiInfo[WndNum]->MdiIconEditInfo->NowTool=LOWORD(wParam);
+                        if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel){
+                            if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2)
+                                DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+                            MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
                         }
-                        InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,0);
+                        InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,0);
                     }
-                    else MdiInfo[WndNum].MdiIconEditInfo->NowTool=LOWORD(wParam);
+                    else MdiInfo[WndNum]->MdiIconEditInfo->NowTool=LOWORD(wParam);
                     return 1;
             }
@@ -116 +116 @@
 
             memset(bExist,0,sizeof(BOOL)*4);
-            for(i=0;i<MdiInfo[WndNum].MdiIconEditInfo->num;i++){
-                if(MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biWidth==16&&
-                    MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biBitCount==4){
+            for(i=0;i<MdiInfo[WndNum]->MdiIconEditInfo->num;i++){
+                if(MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biWidth==16&&
+                    MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biBitCount==4){
                     bExist[0]=1;
                 }
-                if(MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biWidth==16&&
-                    MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biBitCount==8){
+                if(MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biWidth==16&&
+                    MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biBitCount==8){
                     bExist[1]=1;
                 }
-                if(MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biWidth==32&&
-                    MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biBitCount==4){
+                if(MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biWidth==32&&
+                    MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biBitCount==4){
                     bExist[2]=1;
                 }
-                if(MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biWidth==32&&
-                    MdiInfo[WndNum].MdiIconEditInfo->pBmpHdr[i]->biBitCount==8){
+                if(MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biWidth==32&&
+                    MdiInfo[WndNum]->MdiIconEditInfo->pBmpHdr[i]->biBitCount==8){
                     bExist[3]=1;
                 }
@@ -196 +196 @@
                     DeleteIconType(WndNum);
 
-                    if(MdiInfo[WndNum].MdiIconEditInfo->num<=1)
+                    if(MdiInfo[WndNum]->MdiIconEditInfo->num<=1)
                         EnableWindow(GetDlgItem(hwnd,IDC_DELETE_ICONTYPE),0);
                     return 1;
@@ -204 +204 @@
 
                         //イメージ選択用のメモリを解放
-                        if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2)
-                            DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-                        MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
-
-                        MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum=
+                        if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2)
+                            DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+                        MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
+
+                        MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum=
                             SendDlgItemMessage(hwnd,IDC_ICONTYPECOMBO,CB_GETCURSEL,0,0);
 
                         HBRUSH hOldBrush;
-                        hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
-                        PatBlt(MdiInfo[WndNum].MdiIconEditInfo->memdc,0,0,400,400,PATCOPY);
-                        SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hOldBrush);
+                        hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,GetStockObject(WHITE_BRUSH));
+                        PatBlt(MdiInfo[WndNum]->MdiIconEditInfo->memdc,0,0,400,400,PATCOPY);
+                        SelectObject(MdiInfo[WndNum]->MdiIconEditInfo->memdc,hOldBrush);
                         DrawIconToMemBmp(WndNum,0);
 
-                        InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,1);
-                        InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hColorDlg,NULL,0);
+                        InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,1);
+                        InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hColorDlg,NULL,0);
                     }
                     return 1;

trunk/ab5.0/abdev/abdev/IconEditor_UndoRedo.cpp

@@ -8 +8 @@
     ICONEDIT_UNDOSTATE *pUndoState;
 
-    pUndoState=&MdiInfo[WndNum].MdiIconEditInfo->undo[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+    pUndoState=&MdiInfo[WndNum]->MdiIconEditInfo->undo[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
 
     i=pUndoState->NowPos-1;
@@ -18 +18 @@
     pUndoState->NowPos=i;
 
-    pByte=MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
-    MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]=
+    pByte=MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
+    MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]=
         pUndoState->lpData[i];
     pUndoState->lpData[i]=pByte;
 
     //選択フレームを消去
-    if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==2){
-        DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-        MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
+    if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==2){
+        DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+        MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
     }
 
     //再描画
     DrawIconToMemBmp(WndNum,0);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,0);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,0);
 
-    MdiInfo[WndNum].MdiIconEditInfo->bModify=1;
+    MdiInfo[WndNum]->MdiIconEditInfo->bModify=1;
 
     //メニューを有効化
@@ -42 +42 @@
     ICONEDIT_UNDOSTATE *pUndoState;
 
-    pUndoState=&MdiInfo[WndNum].MdiIconEditInfo->undo[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+    pUndoState=&MdiInfo[WndNum]->MdiIconEditInfo->undo[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
 
     if(!pUndoState->lpData[pUndoState->NowPos]){
@@ -49 +49 @@
     }
 
-    pByte=MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
-    MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]=
+    pByte=MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
+    MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]=
         pUndoState->lpData[pUndoState->NowPos];
     pUndoState->lpData[pUndoState->NowPos]=pByte;
 
     DrawIconToMemBmp(WndNum,0);
-    InvalidateRect(MdiInfo[WndNum].MdiIconEditInfo->hMain,NULL,0);
+    InvalidateRect(MdiInfo[WndNum]->MdiIconEditInfo->hMain,NULL,0);
 
     pUndoState->NowPos++;
     if(pUndoState->NowPos==MAX_ICONEDIT_UNDONUM) pUndoState->NowPos=0;
 
-    MdiInfo[WndNum].MdiIconEditInfo->bModify=1;
+    MdiInfo[WndNum]->MdiIconEditInfo->bModify=1;
 
     ResetState_UndoMenu();
@@ -69 +69 @@
     ICONEDIT_UNDOSTATE *pUndoState;
 
-    pUndoState=&MdiInfo[WndNum].MdiIconEditInfo->undo[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
+    pUndoState=&MdiInfo[WndNum]->MdiIconEditInfo->undo[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum];
 
     //Redoされた場合の不要なデータを削除する
@@ -80 +80 @@
 
     pUndoState->lpData[pUndoState->NowPos]=(BYTE *)
-        HeapAlloc(hHeap,0,MdiInfo[WndNum].MdiIconEditInfo->dwBytesInRes[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]);
+        HeapAlloc(hHeap,0,MdiInfo[WndNum]->MdiIconEditInfo->dwBytesInRes[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]);
 
     memcpy(pUndoState->lpData[pUndoState->NowPos],
-        MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum],
-        MdiInfo[WndNum].MdiIconEditInfo->dwBytesInRes[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum]);
+        MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum],
+        MdiInfo[WndNum]->MdiIconEditInfo->dwBytesInRes[MdiInfo[WndNum]->MdiIconEditInfo->SelectIconNum]);
 
     pUndoState->NowPos++;
@@ -94 +94 @@
     }
 
-    MdiInfo[WndNum].MdiIconEditInfo->bModify=1;
+    MdiInfo[WndNum]->MdiIconEditInfo->bModify=1;
 
     ResetState_UndoMenu();

trunk/ab5.0/abdev/abdev/MenuProc.cpp

@@ -121 +121 @@
     // ウィンドウ プロパティを更新
     for(i=0;i<MdiInfo.size();i++){
-        if(MdiInfo[i].hwnd&&MdiInfo[i].DocType==WNDTYPE_RAD){
-            if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                ChangePropertyWindow(i,GetWndInfoNum(MdiInfo[i].path));
+        if(MdiInfo[i]->hwnd&&MdiInfo[i]->DocType==WNDTYPE_RAD){
+            if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                ChangePropertyWindow(i,GetWndInfoNum(MdiInfo[i]->path));
         }
     }
@@ -135 +135 @@
     //ウィンドウが開かれている場合は閉じる
     for(i=0;i<MdiInfo.size();i++){
-        if(MdiInfo[i].hwnd&&lstrcmpi(projectInfo.pMenuInfo[MenuInfoNum].IdName,MdiInfo[i].path.c_str())==0){
-            SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0);
+        if(MdiInfo[i]->hwnd&&lstrcmpi(projectInfo.pMenuInfo[MenuInfoNum].IdName,MdiInfo[i]->path.c_str())==0){
+            SendMessage(MdiInfo[i]->hwnd,WM_CLOSE,0,0);
             break;
         }
@@ -165 +165 @@
     // ウィンドウ プロパティを更新
     for(i=0;i<MdiInfo.size();i++){
-        if(MdiInfo[i].hwnd&&MdiInfo[i].DocType==WNDTYPE_RAD){
-            if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                ChangePropertyWindow(i,GetWndInfoNum(MdiInfo[i].path.c_str()));
+        if(MdiInfo[i]->hwnd&&MdiInfo[i]->DocType==WNDTYPE_RAD){
+            if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                ChangePropertyWindow(i,GetWndInfoNum(MdiInfo[i]->path.c_str()));
         }
     }
@@ -199 +199 @@
     while(hChild){
         i=GetWndNum(hChild);
-        if(MdiInfo[i].DocType==WNDTYPE_MENU){
-            if(lstrcmpi(MdiInfo[i].path.c_str(),pMenuInfo->IdName)==0) break;
+        if(MdiInfo[i]->DocType==WNDTYPE_MENU){
+            if(lstrcmpi(MdiInfo[i]->path.c_str(),pMenuInfo->IdName)==0) break;
         }
         hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -228 +228 @@
 
     mdic.lParam=0;
+    mdic.style |= WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
     hChild=(HWND)SendMessage(hClient,WM_MDICREATE,0,(long)&mdic);   //ウィンドウ作成
 
@@ -248 +249 @@
 
     //ウィンドウのID登録
-    MdiInfo.push_back( MDIINFO() );
+    MdiInfo.push_back( new MDIINFO() );
     i = MdiInfo.size()-1;
-    MdiInfo[i].hwnd=hChild;
-    MdiInfo[i].DocType=WNDTYPE_MENU;
-    MdiInfo[i].title = pMenuInfo->IdName;
-    MdiInfo[i].path = pMenuInfo->IdName;
+    MdiInfo[i]->hwnd=hChild;
+    MdiInfo[i]->DocType=WNDTYPE_MENU;
+    MdiInfo[i]->title = pMenuInfo->IdName;
+    MdiInfo[i]->path = pMenuInfo->IdName;
 
 
@@ -259 +260 @@
     //MENU ウィンドウ情報
 
-    MdiInfo[i].MdiMenuInfo=(MDIMENUINFO *)GlobalAlloc(GPTR,sizeof(MDIMENUINFO));
-
-    MdiInfo[i].MdiMenuInfo->hList=hListWnd;
-
-    MdiInfo[i].MdiMenuInfo->hMenuEdit=hMenuEdit;
-    MdiInfo[i].MdiMenuInfo->hEdit_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENUEDIT),hMenuEdit,(DLGPROC)MenuEditDlg);
+    MdiInfo[i]->MdiMenuInfo=(MDIMENUINFO *)GlobalAlloc(GPTR,sizeof(MDIMENUINFO));
+
+    MdiInfo[i]->MdiMenuInfo->hList=hListWnd;
+
+    MdiInfo[i]->MdiMenuInfo->hMenuEdit=hMenuEdit;
+    MdiInfo[i]->MdiMenuInfo->hEdit_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENUEDIT),hMenuEdit,(DLGPROC)MenuEditDlg);
 
     SCROLLINFO ScrollInfo;
@@ -270 +271 @@
     ScrollInfo.fMask=SIF_POS;
     ScrollInfo.nPos=0;
-    SetScrollInfo(MdiInfo[i].MdiMenuInfo->hMenuEdit,SB_VERT,&ScrollInfo,1);
+    SetScrollInfo(MdiInfo[i]->MdiMenuInfo->hMenuEdit,SB_VERT,&ScrollInfo,1);
 
     SendMessage(hListWnd,LB_RESETCONTENT,0,0);
@@ -282 +283 @@
     //ウィンドウ位置を初期化
     GetClientRect(hChild,&rect);
-    MoveWindow(MdiInfo[i].MdiMenuInfo->hMenuEdit,0,0,172,rect.bottom,1);
-    MoveWindow(MdiInfo[i].MdiMenuInfo->hList,172,0,rect.right-172,rect.bottom,1);
+    MoveWindow(MdiInfo[i]->MdiMenuInfo->hMenuEdit,0,0,172,rect.bottom,1);
+    MoveWindow(MdiInfo[i]->MdiMenuInfo->hList,172,0,rect.right-172,rect.bottom,1);
 
     //Docコンボボックスに追加
@@ -334 +335 @@
             SetPosCenter(hwnd);
             i=GetWndNum(GetWindow(hClient,GW_CHILD));
-            GetDlgItemText(MdiInfo[i].MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,temporary,MAX_PATH);
+            GetDlgItemText(MdiInfo[i]->MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,temporary,MAX_PATH);
             SetDlgItemText(hwnd,IDC_IDNAME,temporary);
-            GetDlgItemText(MdiInfo[i].MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,temporary,MAX_PATH);
+            GetDlgItemText(MdiInfo[i]->MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,temporary,MAX_PATH);
             SetDlgItemText(hwnd,IDC_CAPTION,temporary);
 
@@ -396 +397 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR) return 1;
                     i2=0;
@@ -410 +411 @@
                     if(!pMenuInfo->pMenuInfo){
                         //ID
-                        SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,pMenuInfo->IdName);
+                        SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,pMenuInfo->IdName);
                     }
 
                     //キャプション
-                    SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,pMenuInfo->caption);
+                    SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,pMenuInfo->caption);
 
                     //リストへキャプションを反映
-                    SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
+                    SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
                     memset(temporary,' ',i3*4);
                     lstrcpy(temporary+i3*4,pMenuInfo->caption);
-                    SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
-
-                    SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
+                    SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
+
+                    SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
                     projectInfo.ModifyOfMaterial=1;
                     return 1;
@@ -428 +429 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR) return 1;
                     i2=0;
@@ -446 +447 @@
 
                         for(i2=0;i2<i;i2++)
-                            SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_DELETESTRING,i4+1,0);
+                            SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_DELETESTRING,i4+1,0);
 
                         HeapDefaultFree(pMenuInfo->pMenuInfo);
@@ -468 +469 @@
                         pMenuInfo->type=MFT_STRING;
                     }
-                    SendMessage(MdiInfo[WndNum].hwnd,WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum].MdiMenuInfo->hList);
+                    SendMessage(MdiInfo[WndNum]->hwnd,WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum]->MdiMenuInfo->hList);
                     projectInfo.ModifyOfMaterial=1;
                     return 1;
@@ -474 +475 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR) return 1;
                     i2=0;
@@ -490 +491 @@
                         pMenuInfo->type=MFT_SEPARATOR;
 
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
                         memset(temporary,' ',i3*4);
                         lstrcpy(temporary+i3*4,"-");
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
                     }
                     else{
@@ -504 +505 @@
                         pMenuInfo->type=MFT_STRING;
 
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
                         memset(temporary,' ',i3*4);
                         lstrcpy(temporary+i3*4,pMenuInfo->caption);
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
-                    }
-                    SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
-                    SendMessage(MdiInfo[WndNum].hwnd,WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum].MdiMenuInfo->hList);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
+                    }
+                    SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
+                    SendMessage(MdiInfo[WndNum]->hwnd,WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum]->MdiMenuInfo->hList);
                     return 1;
                 case IDC_CHECKED:
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR) return 1;
                     i2=0;
@@ -534 +535 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR) return 1;
                     i2=0;
@@ -553 +554 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
 
                     if(projectInfo.pMenuInfo[MenuInfoNum].NumberOfMenu==0){
@@ -573 +574 @@
                         projectInfo.pMenuInfo[MenuInfoNum].NumberOfMenu++;
 
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_INSERTSTRING,0,(long)pMenuInfo->caption);
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_SETCURSEL,0,0);
-                        SendMessage(GetParent(MdiInfo[WndNum].MdiMenuInfo->hMenuEdit),WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum].MdiMenuInfo->hList);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_INSERTSTRING,0,(long)pMenuInfo->caption);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_SETCURSEL,0,0);
+                        SendMessage(GetParent(MdiInfo[WndNum]->MdiMenuInfo->hMenuEdit),WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum]->MdiMenuInfo->hList);
                     }
                     else{
-                        i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                        i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                         if(i4==LB_ERR){
                             //"新しいメニュー アイテムの挿入位置を選択して下さい"
@@ -622 +623 @@
                         pMenuInfo->NumberOfMenu++;
 
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
-                        SendMessage(GetParent(MdiInfo[WndNum].MdiMenuInfo->hMenuEdit),WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum].MdiMenuInfo->hList);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_INSERTSTRING,i4,(long)temporary);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
+                        SendMessage(GetParent(MdiInfo[WndNum]->MdiMenuInfo->hMenuEdit),WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)MdiInfo[WndNum]->MdiMenuInfo->hList);
                     }
                     projectInfo.ModifyOfMaterial=1;
@@ -631 +632 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR){
                         //"削除するメニュー アイテムを選択して下さい"
@@ -664 +665 @@
 
                     for(i=0;i<i3;i++)
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
-
-                    i=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCOUNT,0,0)-1;
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_DELETESTRING,i4,0);
+
+                    i=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCOUNT,0,0)-1;
                     if(i){
                         if(i<i4) i4=i;
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_SETCURSEL,i4,0);
                     }
 
@@ -677 +678 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR){
                         //"移動するメニュー アイテムを選択して下さい"
@@ -695 +696 @@
                     memcpy(&pMenuInfo->pMenuInfo[i2+1],&tempMenuInfo,sizeof(MENU_INFO));
 
-                    SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_RESETCONTENT,0,0);
-                    SetMenuDataList(MdiInfo[WndNum].MdiMenuInfo->hList,&projectInfo.pMenuInfo[MenuInfoNum],0);
+                    SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_RESETCONTENT,0,0);
+                    SetMenuDataList(MdiInfo[WndNum]->MdiMenuInfo->hList,&projectInfo.pMenuInfo[MenuInfoNum],0);
                     if(!pMenuInfo->pMenuInfo[i2].pMenuInfo)
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_SETCURSEL,i4-1,0);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_SETCURSEL,i4-1,0);
 
                     projectInfo.ModifyOfMaterial=1;
@@ -705 +706 @@
                     WndNum=GetWndNum(GetParent(GetParent(hwnd)));
                     if(WndNum==-1) return 1;
-                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-
-                    i4=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+                    MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+
+                    i4=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                     if(i4==LB_ERR){
                         //"移動するメニュー アイテムを選択して下さい"
@@ -722 +723 @@
                     memcpy(&pMenuInfo->pMenuInfo[i2+1],&tempMenuInfo,sizeof(MENU_INFO));
 
-                    SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_RESETCONTENT,0,0);
-                    SetMenuDataList(MdiInfo[WndNum].MdiMenuInfo->hList,&projectInfo.pMenuInfo[MenuInfoNum],0);
+                    SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_RESETCONTENT,0,0);
+                    SetMenuDataList(MdiInfo[WndNum]->MdiMenuInfo->hList,&projectInfo.pMenuInfo[MenuInfoNum],0);
                     if(!pMenuInfo->pMenuInfo[i2].pMenuInfo)
-                        SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_SETCURSEL,i4+1,0);
+                        SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_SETCURSEL,i4+1,0);
 
                     projectInfo.ModifyOfMaterial=1;
@@ -770 +771 @@
             ScrollInfo.fMask=SIF_PAGE|SIF_RANGE|SIF_POS;
             GetScrollInfo(hwnd,SB_VERT,&ScrollInfo);
-            GetClientRect(MdiInfo[i].MdiMenuInfo->hEdit_Dlg,&rect);
+            GetClientRect(MdiInfo[i]->MdiMenuInfo->hEdit_Dlg,&rect);
             ScrollInfo.nMin=0;
             ScrollInfo.nMax=rect.bottom;
@@ -796 +797 @@
             WndNum=GetWndNum(hwnd);
             if(WndNum==-1) return 0;
-            MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum].path);
-            if((HWND)lParam==MdiInfo[WndNum].MdiMenuInfo->hList&&HIWORD(wParam)==LBN_SELCHANGE){
-                i=SendMessage(MdiInfo[WndNum].MdiMenuInfo->hList,LB_GETCURSEL,0,0);
+            MenuInfoNum=GetMenuInfoNum(MdiInfo[WndNum]->path);
+            if((HWND)lParam==MdiInfo[WndNum]->MdiMenuInfo->hList&&HIWORD(wParam)==LBN_SELCHANGE){
+                i=SendMessage(MdiInfo[WndNum]->MdiMenuInfo->hList,LB_GETCURSEL,0,0);
                 i2=0;
                 i3=0;
@@ -805 +806 @@
 
                 if(pMenuInfo->pMenuInfo){
-                    SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,pMenuInfo->caption);
-                    SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,"");
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_IDSTATIC),0);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_RENAME),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_POPUP),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR),0);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CHECKED),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_DISABLED),1);
-                    SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_POPUP,BM_SETCHECK,BST_CHECKED,0);
-                    SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR,BM_SETCHECK,BST_UNCHECKED,0);
+                    SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,pMenuInfo->caption);
+                    SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,"");
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_IDSTATIC),0);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_RENAME),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_POPUP),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR),0);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CHECKED),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_DISABLED),1);
+                    SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_POPUP,BM_SETCHECK,BST_CHECKED,0);
+                    SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR,BM_SETCHECK,BST_UNCHECKED,0);
                 }
                 else if(pMenuInfo->type==MFT_STRING){
-                    SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,pMenuInfo->caption);
-                    SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,pMenuInfo->IdName);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_IDSTATIC),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CAPTIONSTATIC),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_RENAME),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_POPUP),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CHECKED),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_DISABLED),1);
-                    SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_POPUP,BM_SETCHECK,BST_UNCHECKED,0);
-                    SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR,BM_SETCHECK,BST_UNCHECKED,0);
+                    SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,pMenuInfo->caption);
+                    SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,pMenuInfo->IdName);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_IDSTATIC),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CAPTIONSTATIC),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_RENAME),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_POPUP),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CHECKED),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_DISABLED),1);
+                    SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_POPUP,BM_SETCHECK,BST_UNCHECKED,0);
+                    SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR,BM_SETCHECK,BST_UNCHECKED,0);
                 }
                 else if(pMenuInfo->type==MFT_SEPARATOR){
-                    SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,"");
-                    SetDlgItemText(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,"");
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_IDSTATIC),0);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CAPTIONSTATIC),0);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_RENAME),0);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_POPUP),0);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR),1);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CHECKED),0);
-                    EnableWindow(GetDlgItem(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_DISABLED),0);
-                    SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_POPUP,BM_SETCHECK,BST_UNCHECKED,0);
-                    SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR,BM_SETCHECK,BST_CHECKED,0);
+                    SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CAPTION,"");
+                    SetDlgItemText(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_IDNAME,"");
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_IDSTATIC),0);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CAPTIONSTATIC),0);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_RENAME),0);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_POPUP),0);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR),1);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CHECKED),0);
+                    EnableWindow(GetDlgItem(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_DISABLED),0);
+                    SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_POPUP,BM_SETCHECK,BST_UNCHECKED,0);
+                    SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_SEPARATOR,BM_SETCHECK,BST_CHECKED,0);
                 }
 
                 if(pMenuInfo->state&MFS_CHECKED) i2=BST_CHECKED;
                 else i2=BST_UNCHECKED;
-                SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_CHECKED,BM_SETCHECK,i2,0);
+                SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_CHECKED,BM_SETCHECK,i2,0);
                 if(pMenuInfo->state&MFS_DISABLED) i2=BST_CHECKED;
                 else i2=BST_UNCHECKED;
-                SendDlgItemMessage(MdiInfo[WndNum].MdiMenuInfo->hEdit_Dlg,IDC_DISABLED,BM_SETCHECK,i2,0);
+                SendDlgItemMessage(MdiInfo[WndNum]->MdiMenuInfo->hEdit_Dlg,IDC_DISABLED,BM_SETCHECK,i2,0);
             }
             return 0;
@@ -856 +857 @@
             if(i==-1) return 0; //ウィンドウが初期状態の場合
 
-            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i].title.c_str());
+            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i,0);
             SetStatusText(NULL);
@@ -864 +865 @@
             WndNum=GetWndNum(hwnd);
             if(WndNum==-1) break;
-            MoveWindow(MdiInfo[WndNum].MdiMenuInfo->hMenuEdit,0,0,172,HIWORD(lParam),1);
-            MoveWindow(MdiInfo[WndNum].MdiMenuInfo->hList,172,0,LOWORD(lParam)-172,HIWORD(lParam),1);
+            MoveWindow(MdiInfo[WndNum]->MdiMenuInfo->hMenuEdit,0,0,172,HIWORD(lParam),1);
+            MoveWindow(MdiInfo[WndNum]->MdiMenuInfo->hList,172,0,LOWORD(lParam)-172,HIWORD(lParam),1);
             break;
         case WM_CLOSE:

trunk/ab5.0/abdev/abdev/MessageCallOperation.cpp

@@ -41 +41 @@
     CallBackNameLen=pWindowInfo->GetCallbackName().size();
 
-    buffer = ReadBuffer( projectInfo.GetWorkDir().GetPath() + pWindowInfo->GetSourceFileName() );
+    buffer = ReadBuffer( projectInfo.GetWorkDir().GetPath() + pWindowInfo->GetSourceFileNameForOldVer( projectInfo.GetWorkDir().GetPath() ) );
 
     *num=0;
@@ -50 +50 @@
     //メッセージ
     *ppItemEventInfo=(ITEMEVENTINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(ITEMEVENTINFO));
-    for(i=0,i4=0;;i++){
-        if(buffer[i]=='\0') break;
-
-        //注釈（複数行）
-        if(buffer[i]=='/'&&buffer[i+1]=='*'){
-            i+=2;
-            while(!(buffer[i]=='*'&&buffer[i+1]=='/')){
-                if(buffer[i]=='\0'){
-                    i--;
-                    break;
-                }
-                i++;
-            }
-            continue;
-        }
-
-        if((buffer[i]=='\r'&&buffer[i+1]=='\n'&&buffer[i+2]!='\0')||i==0){
-            if(buffer[i]=='\r'&&buffer[i+1]=='\n') i2=i+2;
-            else i2=i;
-            while(buffer[i2]>='0'&&buffer[i2]<='9') i2++;
-            while(buffer[i2]==' '||buffer[i2]=='\t') i2++;
-            if(memicmp(buffer+i2,"Sub",3)==0&&(buffer[i2+3]==' '||buffer[i2+3]=='\t')){
-                i2+=4;
+
+    if( buffer )
+    {
+        for(i=0,i4=0;;i++){
+            if(buffer[i]=='\0') break;
+
+            //注釈（複数行）
+            if(buffer[i]=='/'&&buffer[i+1]=='*'){
+                i+=2;
+                while(!(buffer[i]=='*'&&buffer[i+1]=='/')){
+                    if(buffer[i]=='\0'){
+                        i--;
+                        break;
+                    }
+                    i++;
+                }
+                continue;
+            }
+
+            if((buffer[i]=='\r'&&buffer[i+1]=='\n'&&buffer[i+2]!='\0')||i==0){
+                if(buffer[i]=='\r'&&buffer[i+1]=='\n') i2=i+2;
+                else i2=i;
+                while(buffer[i2]>='0'&&buffer[i2]<='9') i2++;
                 while(buffer[i2]==' '||buffer[i2]=='\t') i2++;
-                strncpy(temporary,buffer+i2,NameLen);
-                temporary[NameLen]=0;
-                if( pWindowInfo->GetName() == temporary && buffer[i2+NameLen] == '_' ){
-                    for(i2+=NameLen+1,i3=0;;i2++,i3++){
-                        if(!IsVariableChar(buffer[i2])){
-                            temporary[i3]=0;
-                            break;
-                        }
-                        temporary[i3]=buffer[i2];
-                    }
-                    i6=GetItemMessageInfo(WndInfoNum,temporary,temp2);
-                    if(i6){
-                        //アイテムメッセージ（WM_COMMAND、WM_NOTIFY）
-                        for(i5=0;;i5++){
-                            if((*ppItemEventInfo)[i5].IdName==0){
-                                *ppItemEventInfo=(ITEMEVENTINFO *)HeapReAlloc(hHeap,HEAP_ZERO_MEMORY,*ppItemEventInfo,(i4+2)*sizeof(ITEMEVENTINFO));
-                                (*ppItemEventInfo)[i4].IdName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-                                lstrcpy((*ppItemEventInfo)[i4].IdName,temporary);
-                                (*ppItemEventInfo)[i4].pEventNames=(char **)HeapAlloc(hHeap,0,1);
-                                (*ppItemEventInfo)[i4].ClassID=i6;
-                                i4++;
+                if(memicmp(buffer+i2,"Sub",3)==0&&(buffer[i2+3]==' '||buffer[i2+3]=='\t')){
+                    i2+=4;
+                    while(buffer[i2]==' '||buffer[i2]=='\t') i2++;
+                    strncpy(temporary,buffer+i2,NameLen);
+                    temporary[NameLen]=0;
+                    if( pWindowInfo->GetName() == temporary && buffer[i2+NameLen] == '_' ){
+                        for(i2+=NameLen+1,i3=0;;i2++,i3++){
+                            if(!IsVariableChar(buffer[i2])){
+                                temporary[i3]=0;
                                 break;
                             }
-                            if(lstrcmp((*ppItemEventInfo)[i5].IdName,temporary)==0) break;
+                            temporary[i3]=buffer[i2];
                         }
-                        (*ppItemEventInfo)[i5].pEventNames=(char **)HeapReAlloc(hHeap,0,(*ppItemEventInfo)[i5].pEventNames,((*ppItemEventInfo)[i5].EventNum+1)*sizeof(char *));
-                        (*ppItemEventInfo)[i5].pEventNames[(*ppItemEventInfo)[i5].EventNum]=(char *)HeapAlloc(hHeap,0,lstrlen(temp2)+1);
-                        lstrcpy((*ppItemEventInfo)[i5].pEventNames[(*ppItemEventInfo)[i5].EventNum],temp2);
-                        (*ppItemEventInfo)[i5].EventNum++;
+                        i6=GetItemMessageInfo(WndInfoNum,temporary,temp2);
+                        if(i6){
+                            //アイテムメッセージ（WM_COMMAND、WM_NOTIFY）
+                            for(i5=0;;i5++){
+                                if((*ppItemEventInfo)[i5].IdName==0){
+                                    *ppItemEventInfo=(ITEMEVENTINFO *)HeapReAlloc(hHeap,HEAP_ZERO_MEMORY,*ppItemEventInfo,(i4+2)*sizeof(ITEMEVENTINFO));
+                                    (*ppItemEventInfo)[i4].IdName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+                                    lstrcpy((*ppItemEventInfo)[i4].IdName,temporary);
+                                    (*ppItemEventInfo)[i4].pEventNames=(char **)HeapAlloc(hHeap,0,1);
+                                    (*ppItemEventInfo)[i4].ClassID=i6;
+                                    i4++;
+                                    break;
+                                }
+                                if(lstrcmp((*ppItemEventInfo)[i5].IdName,temporary)==0) break;
+                            }
+                            (*ppItemEventInfo)[i5].pEventNames=(char **)HeapReAlloc(hHeap,0,(*ppItemEventInfo)[i5].pEventNames,((*ppItemEventInfo)[i5].EventNum+1)*sizeof(char *));
+                            (*ppItemEventInfo)[i5].pEventNames[(*ppItemEventInfo)[i5].EventNum]=(char *)HeapAlloc(hHeap,0,lstrlen(temp2)+1);
+                            lstrcpy((*ppItemEventInfo)[i5].pEventNames[(*ppItemEventInfo)[i5].EventNum],temp2);
+                            (*ppItemEventInfo)[i5].EventNum++;
+                        }
+                        else if(temporary[0]){
+                            //一般メッセージ
+                            ppNames=(char **)HeapReAlloc(hHeap,0,ppNames,(*num+1)*sizeof(char *));
+                            ppNames[*num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+                            lstrcpy(ppNames[*num],temporary);
+                            (*num)++;
+                        }
                     }
-                    else if(temporary[0]){
-                        //一般メッセージ
-                        ppNames=(char **)HeapReAlloc(hHeap,0,ppNames,(*num+1)*sizeof(char *));
-                        ppNames[*num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-                        lstrcpy(ppNames[*num],temporary);
-                        (*num)++;
+                }
+                if(memicmp(buffer+i2,"Function",8)==0&&(buffer[i2+8]==' '||buffer[i2+8]=='\t')){
+                    //[WndName]_WindowProcのみFunction定義
+                    i2+=9;
+                    while(buffer[i2]==' '||buffer[i2]=='\t') i2++;
+                    if(memicmp(buffer+i2,pWindowInfo->GetCallbackName().c_str(),CallBackNameLen)==0&&
+                        (buffer[i2+CallBackNameLen]==' '||buffer[i2+CallBackNameLen]=='\t'||buffer[i2+CallBackNameLen]=='(')){
+                        *pbAlways=1;
                     }
                 }
             }
-            if(memicmp(buffer+i2,"Function",8)==0&&(buffer[i2+8]==' '||buffer[i2+8]=='\t')){
-                //[WndName]_WindowProcのみFunction定義
-                i2+=9;
-                while(buffer[i2]==' '||buffer[i2]=='\t') i2++;
-                if(memicmp(buffer+i2,pWindowInfo->GetCallbackName().c_str(),CallBackNameLen)==0&&
-                    (buffer[i2+CallBackNameLen]==' '||buffer[i2+CallBackNameLen]=='\t'||buffer[i2+CallBackNameLen]=='(')){
-                    *pbAlways=1;
-                }
-            }
-        }
-    }
-    HeapDefaultFree(buffer);
+        }
+        HeapDefaultFree(buffer);
+    }
 
     return ppNames;
@@ -136 +140 @@
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
-    hChild=OpenFileWithExtension( projectInfo.GetWorkDir().GetPath() + pWindowInfo->GetSourceFileName() );
+    hChild=OpenFileWithExtension( projectInfo.GetWorkDir().GetPath() + pWindowInfo->GetSourceFileNameForOldVer( projectInfo.GetWorkDir().GetPath() ) );
     if(!hChild) return;
     WndNum=GetWndNum(hChild);
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     for(i=0;;i++){
@@ -195 +199 @@
         TextEdit_SetSel(WndNum,i+2,i+i2);
     }
-    SetFocus(MdiInfo[WndNum].pMdiTextEdit->hEdit);
+    SetFocus(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
 }
 void InsertEventToList(HWND hList,int ItemNum,char *EventName,char *MessageName,char *OutLine){
@@ -221 +225 @@
 
     MaxCount=ListView_GetItemCount(hList);
-    if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+    if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
         if(dwEventType==EVENTTYPE_DEFAULT){
             for(i=0;i<MaxCount;i++){
@@ -296 +300 @@
                 sprintf(EventName,"%s_%s_%s",
                     pWindowInfo->GetName().c_str(),
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetName().c_str(),
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetName().c_str(),
                     temporary);
                 break;
@@ -303 +307 @@
         if(i==MaxCount) return 0;
 
-        if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTVIEW){
+        if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTVIEW){
             //ListView
             if(i==0) lstrcpy(Parameter,"ByRef nmListView As NMLISTVIEW");
@@ -327 +331 @@
             else if(i==20) lstrcpy(Parameter,"ByRef nmLVDispInfo As NMLVDISPINFO");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_PROGRESSBAR){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_PROGRESSBAR){
             //ProgressBar
             lstrcpy(Parameter,"ByRef nmHdr As NMHDR");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_TRACKBAR){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TRACKBAR){
             //TrackBar
             lstrcpy(Parameter,"ByRef nmHdr As NMHDR");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_TREEVIEW){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TREEVIEW){
             //TreeView
             if(0<=i&&i<=7) lstrcpy(Parameter,"ByRef nmHdr As NMHDR");
             else lstrcpy(Parameter,"ByRef nmTreeView As NMTREEVIEW");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_UPDOWN){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_UPDOWN){
             //UpDown
             if(i==0) lstrcpy(Parameter,"ByRef nmHdr As NMHDR");
@@ -400 +404 @@
 
     WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
     i=0;
-    if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+    if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
         EnableWindow(GetDlgItem(hDlg,IDC_DEFAULT),1);
         EnableWindow(GetDlgItem(hDlg,IDC_MENU),1);
@@ -458 +462 @@
         EnableWindow(GetDlgItem(hDlg,IDC_MMSYS),0);
         SendDlgItemMessage(hDlg,IDC_DEFAULT,BM_SETCHECK,BST_CHECKED,0);
-        if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_BUTTON){
+        if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_BUTTON){
             //Button
             InsertEventToList(hList,i++,"Click","BN_CLICKED","ﾎﾞﾀﾝがｸﾘｯｸされた時");
             InsertEventToList(hList,i++,"DblClick","BN_DBLCLK","ﾎﾞﾀﾝがﾀﾞﾌﾞﾙ ｸﾘｯｸされた時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX){
             //CheckBox
             InsertEventToList(hList,i++,"Click","BN_CLICKED","ﾁｪｯｸ ﾎﾞｯｸｽがｸﾘｯｸされた時");
             InsertEventToList(hList,i++,"DblClick","BN_DBLCLK","ﾁｪｯｸ ﾎﾞｯｸｽがﾀﾞﾌﾞﾙ ｸﾘｯｸされた時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_COMBOBOX){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_COMBOBOX){
             //ComboBox
             InsertEventToList(hList,i++,"CloseUp","CBN_CLOSEUP","ﾘｽﾄ ﾎﾞｯｸｽが非表示になる時");
@@ -482 +486 @@
             InsertEventToList(hList,i++,"SetFocus","CBN_SETFOCUS","入力ﾌｫｰｶｽを取得した時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT){
             //Edit
             InsertEventToList(hList,i++,"Change","EN_CHANGE","ｴﾃﾞｨｯﾄ ﾎﾞｯｸｽの内容が変更された時（後処理）");
@@ -493 +497 @@
             InsertEventToList(hList,i++,"VScroll","EN_VSCROLL","垂直ｽｸﾛｰﾙを行った時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_IMAGEBOX){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_IMAGEBOX){
             //ImageBox
             InsertEventToList(hList,i++,"Click","STN_CLICKED","ｲﾒｰｼﾞ ﾎﾞｯｸｽがｸﾘｯｸされた時");
             InsertEventToList(hList,i++,"DblClick","STN_DBLCLK","ｲﾒｰｼﾞ ﾎﾞｯｸｽがﾀﾞﾌﾞﾙ ｸﾘｯｸされた時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX){
             //ListBox
             InsertEventToList(hList,i++,"SelChange","LBN_SELCHANGE","ﾘｽﾄ内の選択が変更された時");
@@ -507 +511 @@
             InsertEventToList(hList,i++,"SetFocus","LBN_SETFOCUS","入力ﾌｫｰｶｽを取得した時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTVIEW){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTVIEW){
             //ListView
             i=SetDefaultNotifyMessagesInList(hList,CT_LISTVIEW);
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_PROGRESSBAR){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_PROGRESSBAR){
             //ProgressBar
             InsertEventToList(hList,i++,"OutOfMemory","NM_OUTOFMEMORY","ﾒﾓﾘ不足でｺﾝﾄﾛｰﾙの動作が完了できない時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON){
             //RadioButton
             InsertEventToList(hList,i++,"Click","BN_CLICKED","ﾗｼﾞｵ ﾎﾞﾀﾝがｸﾘｯｸされた時");
             InsertEventToList(hList,i++,"DblClick","BN_DBLCLK","ﾗｼﾞｵ ﾎﾞﾀﾝがﾀﾞﾌﾞﾙ ｸﾘｯｸされた時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC){
             //Static
             InsertEventToList(hList,i++,"Click","STN_CLICKED","ｽﾀﾃｨｯｸ ﾃｷｽﾄがｸﾘｯｸされた時");
             InsertEventToList(hList,i++,"DblClick","STN_DBLCLK","ｽﾀﾃｨｯｸ ﾃｷｽﾄがﾀﾞﾌﾞﾙ ｸﾘｯｸされた時");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_TRACKBAR){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TRACKBAR){
             //TrackBar
             InsertEventToList(hList,i++,"OutOfMemory","NM_OUTOFMEMORY","ﾒﾓﾘ不足でｺﾝﾄﾛｰﾙの動作が完了できない時");
@@ -531 +535 @@
             InsertEventToList(hList,i++,"CustomDraw","NM_CUSTOMDRAW ","ｶｽﾀﾑ描画操作の通知");
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_TREEVIEW){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TREEVIEW){
             //TreeView
             i=SetDefaultNotifyMessagesInList(hList,CT_TREEVIEW);
         }
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_UPDOWN){
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_UPDOWN){
             //UpDown
             InsertEventToList(hList,i++,"OutOfMemory","NM_OUTOFMEMORY","ﾒﾓﾘ不足でｺﾝﾄﾛｰﾙの動作が完了できない時");
@@ -595 +599 @@
         hList=GetDlgItem(hwnd,IDC_EVENTLIST);
         WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-        WndInfoNum=GetWndInfoNum(MdiInfo[WndNum].path);
+        WndInfoNum=GetWndInfoNum(MdiInfo[WndNum]->path);
 
         ListView_DeleteAllItems(hList);
@@ -644 +648 @@
             {
                 WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
                 NowMenuNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str());
             }
@@ -671 +675 @@
                     hList=GetDlgItem(hwnd,IDC_EVENTLIST);
                     WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-                    WndInfoNum=GetWndInfoNum(MdiInfo[WndNum].path);
+                    WndInfoNum=GetWndInfoNum(MdiInfo[WndNum]->path);
                     if(GetEventProcedureNameFromListView(hList,WndNum,WndInfoNum,temporary,temp2,dwEventType)){
                         SelectProcedureOfMessageCall(WndInfoNum,temporary,temp2);
@@ -689 +693 @@
                     hList=GetDlgItem(hwnd,IDC_EVENTLIST);
                     WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-                    WndInfoNum=GetWndInfoNum(MdiInfo[WndNum].path);
+                    WndInfoNum=GetWndInfoNum(MdiInfo[WndNum]->path);
                     if(GetEventProcedureNameFromListView(hList,WndNum,WndInfoNum,temporary,temp2,dwEventType)){
                         sprintf(temporary+lstrlen(temporary),"(%s)",temp2);

trunk/ab5.0/abdev/abdev/ParameterHint.cpp

@@ -39 +39 @@
 
         for(i=0;i<MdiInfo.size();i++){
-            if(MdiInfo[i].hwnd){
-                if(lstrcmpi(MdiInfo[i].path.c_str(),temporary)==0) break;
+            if(MdiInfo[i]->hwnd){
+                if(lstrcmpi(MdiInfo[i]->path.c_str(),temporary)==0) break;
             }
         }
@@ -49 +49 @@
         else{
             //エディタから読み込む
-            pBuf=(char *)HeapAlloc(hHeap,0,lstrlen(MdiInfo[i].pMdiTextEdit->buffer)+1);
-            lstrcpy(pBuf,MdiInfo[i].pMdiTextEdit->buffer);
+            pBuf=(char *)HeapAlloc(hHeap,0,lstrlen(MdiInfo[i]->pMdiTextEdit->buffer)+1);
+            lstrcpy(pBuf,MdiInfo[i]->pMdiTextEdit->buffer);
         }
     }
@@ -59 +59 @@
         WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
 
-        pBuf=(char *)HeapAlloc(hHeap,0,lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer)+1);
-        lstrcpy(pBuf,MdiInfo[WndNum].pMdiTextEdit->buffer);
+        pBuf=(char *)HeapAlloc(hHeap,0,lstrlen(MdiInfo[WndNum]->pMdiTextEdit->buffer)+1);
+        lstrcpy(pBuf,MdiInfo[WndNum]->pMdiTextEdit->buffer);
     }
 
@@ -685 +685 @@
     char temp2[8192];
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     //キャレットが示すバッファインデックスを取得
     iPos=GetBufferIndexFromCaretPos(
         pBuf,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
 
     static int Before_StartCaretY;
     BOOL Before_StartCaretSwitch=0;
-    if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y!=Before_StartCaretY){
-        Before_StartCaretY=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y;
+    if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y!=Before_StartCaretY){
+        Before_StartCaretY=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y;
         Before_StartCaretSwitch=1;
     }
@@ -966 +966 @@
             else{
                 if(MethodCheckInfo.hWnd){
-                    UpdateWindow(MdiInfo[WndNum].pMdiTextEdit->hEdit);  //ちらつき防止
+                    UpdateWindow(MdiInfo[WndNum]->pMdiTextEdit->hEdit); //ちらつき防止
 
                     DestroyWindow(MethodCheckInfo.hWnd);
@@ -1254 +1254 @@
         ReleaseDC(MethodCheckInfo.hWnd,hdc);
 
-        GetWindowRect(MdiInfo[i].hwnd,&rect);
+        GetWindowRect(MdiInfo[i]->hwnd,&rect);
         GetCaretPos(&pos);
-        ClientToScreen(MdiInfo[i].pMdiTextEdit->hEdit,&pos);
+        ClientToScreen(MdiInfo[i]->pMdiTextEdit->hEdit,&pos);
         rect.left=pos.x-20;
         rect.top=pos.y-pobj_nv->lf.lfHeight;

trunk/ab5.0/abdev/abdev/Print.cpp

@@ -93 +93 @@
 
     char *buffer;
-    buffer=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    buffer=MdiInfo[WndNum]->pMdiTextEdit->buffer;
     int i=0,i2=0,iPage=0;
     for(i=0,i2=0;;i++,i2++){
@@ -547 +547 @@
     memset(&di,0,sizeof(DOCINFO));
     di.cbSize=sizeof(DOCINFO);
-    di.lpszDocName=MdiInfo[WndNum].title.c_str();
+    di.lpszDocName=MdiInfo[WndNum]->title.c_str();
     if(StartDoc(pd.hDC,&di)==0){
         MessageBox(hOwner,"印刷できません。プリンターの状況を確認してください。",APPLICATION_NAME,MB_OK | MB_ICONEXCLAMATION);

trunk/ab5.0/abdev/abdev/ProjectControl.cpp

@@ -146 +146 @@
                             //ResetScrollbarが再描画時に呼び出されるので、再描画する
                             WndNum=GetWndNum(hChild);
-                            InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->hEdit,NULL,0);
-                            UpdateWindow(MdiInfo[WndNum].pMdiTextEdit->hEdit);
+                            InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->hEdit,NULL,0);
+                            UpdateWindow(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
                             TextEdit_SelectOneLine(WndNum,pobj_ClassTreeView->pProcInfo[i].code_pos,TRUE);
 
@@ -506 +506 @@
                         SetWindowLongPtr(hwnd,GWL_EXSTYLE,WS_EX_STATICEDGE);
                         SetParent(hwnd,hOwner);
-                        ResizeOwnerWnd();
+                        ActiveBasic::IDE::Program::mainFrame.Resized();
 
                         ShowWindow(hProjectView_ToolWindow,SW_HIDE);
@@ -517 +517 @@
                         SetParent(hwnd,hProjectView_ToolWindow);
 
-                        ResizeOwnerWnd();
+                        ActiveBasic::IDE::Program::mainFrame.Resized();
                         ResizeProjectView_ToolWindow();
 
@@ -1287 +1287 @@
 
                             //ResetScrollbarが再描画時に呼び出されるので、再描画する
-                            InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->hEdit,NULL,0);
-                            UpdateWindow(MdiInfo[WndNum].pMdiTextEdit->hEdit);
+                            InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->hEdit,NULL,0);
+                            UpdateWindow(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
 
                             if(temp2[i2]=='\0') goto EndToSetWorkFile;
@@ -1316 +1316 @@
                             si.fMask=SIF_POS;
                             si.nPos=pos.x;
-                            SetScrollInfo(MdiInfo[WndNum].pMdiTextEdit->hEdit,SB_HORZ,&si,1);
+                            SetScrollInfo(MdiInfo[WndNum]->pMdiTextEdit->hEdit,SB_HORZ,&si,1);
                             si.nPos=pos.y;
-                            SetScrollInfo(MdiInfo[WndNum].pMdiTextEdit->hEdit,SB_VERT,&si,1);
+                            SetScrollInfo(MdiInfo[WndNum]->pMdiTextEdit->hEdit,SB_VERT,&si,1);
 
                             if(temp2[i2]=='\0') goto EndToSetWorkFile;
@@ -1591 +1591 @@
         WndNum=GetWndNum(hChild);
         sw=0;
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-            if( MdiInfo[WndNum].pMdiTextEdit->IsModified() ){
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
+            if( MdiInfo[WndNum]->pMdiTextEdit->IsModified() ){
                 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){
                     projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) sw=1;
-                }
-            }
-        }
-        else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
-            if(MdiInfo[WndNum].MdiIconEditInfo->bModify){
+                    if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0) sw=1;
+                }
+            }
+        }
+        else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
+            if(MdiInfo[WndNum]->MdiIconEditInfo->bModify){
                 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
                 {
                     lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) sw=1;
+                    if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0) sw=1;
                 }
             }
@@ -1648 +1648 @@
     while(hChild){
         WndNum=GetWndNum(hChild);
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
             for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){
                 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0){
                     TextEdit_GetSel(WndNum,&CharRange);
 
@@ -1658 +1658 @@
                     si.cbSize=sizeof(SCROLLINFO);
                     si.fMask=SIF_POS;
-                    GetScrollInfo(MdiInfo[WndNum].pMdiTextEdit->hEdit,SB_HORZ,&si);
+                    GetScrollInfo(MdiInfo[WndNum]->pMdiTextEdit->hEdit,SB_HORZ,&si);
                     pos.x=si.nPos;
-                    GetScrollInfo(MdiInfo[WndNum].pMdiTextEdit->hEdit,SB_VERT,&si);
+                    GetScrollInfo(MdiInfo[WndNum]->pMdiTextEdit->hEdit,SB_VERT,&si);
                     pos.y=si.nPos;
 
@@ -1674 +1674 @@
             }
         }
-        else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
+        else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
             BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
             {
-                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),pWindowInfo->GetName().c_str())==0){
-                    sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum].path.c_str());
+                if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),pWindowInfo->GetName().c_str())==0){
+                    sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum]->path.c_str());
                     i2+=lstrlen(buffer+i2);
                     break;
@@ -1684 +1684 @@
             }
         }
-        else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
+        else if(MdiInfo[WndNum]->DocType==WNDTYPE_MENU){
             for(i=0;i<projectInfo.NumberOfMenu;i++){
-                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),projectInfo.pMenuInfo[i].IdName)==0){
-                    sprintf(buffer+i2,"menu,%s\r\n",MdiInfo[WndNum].path.c_str());
+                if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),projectInfo.pMenuInfo[i].IdName)==0){
+                    sprintf(buffer+i2,"menu,%s\r\n",MdiInfo[WndNum]->path.c_str());
                     i2+=lstrlen(buffer+i2);
                     break;
@@ -1693 +1693 @@
             }
         }
-        else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+        else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
             BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
             {
                 lstrcpy(temporary,resourceItem.filepath.c_str());
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0){
                     sprintf(buffer+i2,"icon,%s\r\n",resourceItem.filepath.c_str());
                     i2+=lstrlen(buffer+i2);

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

@@ -17 +17 @@
     while(hChild){
         i=GetWndNum(hChild);
-        if(MdiInfo[i].DocType==WNDTYPE_RAD){
-            if(lstrcmpi(MdiInfo[i].path.c_str(),windowInfo.GetName().c_str())==0) break;
+        if(MdiInfo[i]->DocType==WNDTYPE_RAD){
+            if(lstrcmpi(MdiInfo[i]->path.c_str(),windowInfo.GetName().c_str())==0) break;
         }
         hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -46 +46 @@
 
     mdic.lParam=0;
+    mdic.style |= WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
     hChild=(HWND)SendMessage(hClient,WM_MDICREATE,0,(long)&mdic);   //ウィンドウ作成
 
@@ -80 +81 @@
     //ウィンドウのID登録
     HDC hdc;
-    MdiInfo.push_back( MDIINFO() );
+    MdiInfo.push_back( new MDIINFO() );
     i = MdiInfo.size()-1;
 
-    MdiInfo[i].hwnd=hChild;
-    MdiInfo[i].DocType=WNDTYPE_RAD;
-    MdiInfo[i].title = windowInfo.GetName();
-    MdiInfo[i].path = windowInfo.GetName();
+    MdiInfo[i]->hwnd=hChild;
+    MdiInfo[i]->DocType=WNDTYPE_RAD;
+    MdiInfo[i]->title = windowInfo.GetName();
+    MdiInfo[i]->path = windowInfo.GetName();
 
 
@@ -93 +94 @@
     ////////////////////////////
 
-    MdiInfo[i].MdiRadInfo=(MDIRADINFO *)GlobalAlloc(GPTR,sizeof(MDIRADINFO));
-
-    MdiInfo[i].MdiRadInfo->hTools=hTools;
-    MdiInfo[i].MdiRadInfo->hProperty=hProperty;
-    MdiInfo[i].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),hProperty,(DLGPROC)RadProperty_WindowProc);
+    MdiInfo[i]->MdiRadInfo=(MDIRADINFO *)GlobalAlloc(GPTR,sizeof(MDIRADINFO));
+
+    MdiInfo[i]->MdiRadInfo->hTools=hTools;
+    MdiInfo[i]->MdiRadInfo->hProperty=hProperty;
+    MdiInfo[i]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),hProperty,(DLGPROC)RadProperty_WindowProc);
 
     SCROLLINFO ScrollInfo;
@@ -103 +104 @@
     ScrollInfo.fMask=SIF_POS;
     ScrollInfo.nPos=0;
-    SetScrollInfo(MdiInfo[i].MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
-
-    MdiInfo[i].MdiRadInfo->hRad=hRad;
-
-    MdiInfo[i].MdiRadInfo->hSupport=hSupport;
+    SetScrollInfo(MdiInfo[i]->MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
+
+    MdiInfo[i]->MdiRadInfo->hRad=hRad;
+
+    MdiInfo[i]->MdiRadInfo->hSupport=hSupport;
 
     hdc=GetDC(hRad);
-    MdiInfo[i].MdiRadInfo->hBitmap=CreateCompatibleBitmap(hdc,ScreenX*2,ScreenY*2);
-    MdiInfo[i].MdiRadInfo->hMemDC=CreateCompatibleDC(hdc);
-    MdiInfo[i].MdiRadInfo->hOldBitmap=
-        (HBITMAP)SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,MdiInfo[i].MdiRadInfo->hBitmap);
+    MdiInfo[i]->MdiRadInfo->hBitmap=CreateCompatibleBitmap(hdc,ScreenX*2,ScreenY*2);
+    MdiInfo[i]->MdiRadInfo->hMemDC=CreateCompatibleDC(hdc);
+    MdiInfo[i]->MdiRadInfo->hOldBitmap=
+        (HBITMAP)SelectObject(MdiInfo[i]->MdiRadInfo->hMemDC,MdiInfo[i]->MdiRadInfo->hBitmap);
     ReleaseDC(hRad,hdc);
 
-    for(i2=0;i2<MAX_RAD_SELITEM;i2++) MdiInfo[i].MdiRadInfo->SelectingItem[i2]=-1;
-    MdiInfo[i].MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
+    for(i2=0;i2<MAX_RAD_SELITEM;i2++) MdiInfo[i]->MdiRadInfo->SelectingItem[i2]=-1;
+    MdiInfo[i]->MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
 
     //変更情報を初期化
-    MdiInfo[i].MdiRadInfo->undo.NowPos=0;
-    memset(MdiInfo[i].MdiRadInfo->undo.Command,0,sizeof(int)*MAX_UNDONUM);
+    MdiInfo[i]->MdiRadInfo->undo.NowPos=0;
+    memset(MdiInfo[i]->MdiRadInfo->undo.Command,0,sizeof(int)*MAX_UNDONUM);
 
     DrawRadWindow(i,&windowInfo);
@@ -286 +287 @@
     //////////////////////////////
     //プロパティウィンドウを設定
-    DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg);
-    MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc);
+    DestroyWindow(MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg);
+    MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc);
 
     SCROLLINFO ScrollInfo;
@@ -293 +294 @@
     ScrollInfo.fMask=SIF_POS;
     ScrollInfo.nPos=0;
-    SetScrollInfo(MdiInfo[WndNum].MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
+    SetScrollInfo(MdiInfo[WndNum]->MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
 
     RECT rect;
-    GetClientRect(MdiInfo[WndNum].MdiRadInfo->hProperty,&rect);
-    SendMessage(MdiInfo[WndNum].MdiRadInfo->hProperty,WM_SIZE,0,MAKELONG(rect.right,rect.bottom));
+    GetClientRect(MdiInfo[WndNum]->MdiRadInfo->hProperty,&rect);
+    SendMessage(MdiInfo[WndNum]->MdiRadInfo->hProperty,WM_SIZE,0,MAKELONG(rect.right,rect.bottom));
 }
 
@@ -344 +345 @@
         {
             const ActiveBasic::PM::ChildWindowInfo *pChildInfo = pWindowInfo->childWindowInfos[i];
-            if(i==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]) continue;
+            if(i==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]) continue;
             if(pChildInfo->Control !=
-                pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control) continue;
+                pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control) continue;
 
             if(NewRect->left<OldRect->left){
                 if(pChildInfo->pos.x
                                             >
-                    NewRect->left - MdiInfo[WndNum].MdiRadInfo->ClientPos.x
+                    NewRect->left - MdiInfo[WndNum]->MdiRadInfo->ClientPos.x
                     &&
                     pChildInfo->pos.x-10
                                             <
-                    NewRect->left - MdiInfo[WndNum].MdiRadInfo->ClientPos.x){
+                    NewRect->left - MdiInfo[WndNum]->MdiRadInfo->ClientPos.x){
 
                     //左側をストップする
                     x=NewRect->right-NewRect->left;
-                    NewRect->left=pChildInfo->pos.x + MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
+                    NewRect->left=pChildInfo->pos.x + MdiInfo[WndNum]->MdiRadInfo->ClientPos.x;
                     NewRect->right=NewRect->left+x;
 
@@ -376 +377 @@
                 if(pChildInfo->pos.y
                                             >
-                    NewRect->top - MdiInfo[WndNum].MdiRadInfo->ClientPos.y
+                    NewRect->top - MdiInfo[WndNum]->MdiRadInfo->ClientPos.y
                     &&
                     pChildInfo->pos.y-10
                                             <
-                    NewRect->top - MdiInfo[WndNum].MdiRadInfo->ClientPos.y){
+                    NewRect->top - MdiInfo[WndNum]->MdiRadInfo->ClientPos.y){
 
                     //左側をストップする
                     y=NewRect->bottom-NewRect->top;
-                    NewRect->top=pChildInfo->pos.y + MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
+                    NewRect->top=pChildInfo->pos.y + MdiInfo[WndNum]->MdiRadInfo->ClientPos.y;
                     NewRect->bottom=NewRect->top+y;
 
@@ -409 +410 @@
     if(swLineStop&&sw==0){
         BitBlt(hdc,0,0,ScreenX*2,ScreenY*2,
-            MdiInfo[WndNum].MdiRadInfo->hMemDC,0,0,SRCCOPY);
+            MdiInfo[WndNum]->MdiRadInfo->hMemDC,0,0,SRCCOPY);
         swLineStop=0;
     }
@@ -415 +416 @@
         BitBlt(hdc,rect.left-LEVER_THICK, rect.top-LEVER_THICK,
             rect.right-rect.left+LEVER_THICK*2, rect.bottom-rect.top+LEVER_THICK*2,
-            MdiInfo[WndNum].MdiRadInfo->hMemDC,x-LEVER_THICK,y-LEVER_THICK,SRCCOPY);
+            MdiInfo[WndNum]->MdiRadInfo->hMemDC,x-LEVER_THICK,y-LEVER_THICK,SRCCOPY);
     }
 
@@ -440 +441 @@
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
-    if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]==SELECT_WINDOW){
+    if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[num]==SELECT_WINDOW){
         //ウィンドウ軸を選択
         rect->left=0;
@@ -449 +450 @@
     else{
         //子ウィンドウを選択
-        rect->left=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]]->pos.x-LEVER_THICK;
-        rect->top=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]]->pos.y-LEVER_THICK;
-        rect->right=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]]->pos.x+pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]]->size.cx+LEVER_THICK;
-        rect->bottom=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]]->pos.y+pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]]->size.cy+LEVER_THICK;
+        rect->left=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[num]]->pos.x-LEVER_THICK;
+        rect->top=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[num]]->pos.y-LEVER_THICK;
+        rect->right=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[num]]->pos.x+pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[num]]->size.cx+LEVER_THICK;
+        rect->bottom=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[num]]->pos.y+pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[num]]->size.cy+LEVER_THICK;
     }
 }
@@ -472 +473 @@
 
     i=0;
-    while(MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]!=-1||i==0){
+    while(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i]!=-1||i==0){
         GetSelectingRect(WndNum,WndInfoNum,i,&tempRect);
         RectNaturalFormat(&tempRect,&rect);
@@ -535 +536 @@
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
-    DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg);
-    if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
-        MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc);
+    DestroyWindow(MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg);
+    if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+        MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc);
 
         ScrollInfo.cbSize=sizeof(SCROLLINFO);
         ScrollInfo.fMask=SIF_POS;
         ScrollInfo.nPos=0;
-        SetScrollInfo(MdiInfo[WndNum].MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
-
-        GetClientRect(MdiInfo[WndNum].MdiRadInfo->hProperty,&rect);
-        SendMessage(MdiInfo[WndNum].MdiRadInfo->hProperty,WM_SIZE,0,MAKELONG(rect.right,rect.bottom));
+        SetScrollInfo(MdiInfo[WndNum]->MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
+
+        GetClientRect(MdiInfo[WndNum]->MdiRadInfo->hProperty,&rect);
+        SendMessage(MdiInfo[WndNum]->MdiRadInfo->hProperty,WM_SIZE,0,MAKELONG(rect.right,rect.bottom));
     }
     else{
-        if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_BUTTON)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_BUTTON),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ButtonProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_CHECKBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_CheckBoxProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_COMBOBOX)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_COMBOBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ComboBoxProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_EDIT),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_EditProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_GROUPBOX)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_GROUPBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_GroupBoxProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_HSCROLLBAR)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_IMAGEBOX)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_IMAGEBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ImageBoxProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListBoxProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTVIEW)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTVIEW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListViewProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_PROGRESSBAR)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_PROGRESSBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ProgressBarProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_RADIOBUTTON),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_RadioButtonProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_STATIC),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_StaticProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_TRACKBAR)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TRACKBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_TrackBarProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_TREEVIEW)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TREEVIEW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_TreeViewProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_UPDOWN)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_UPDOWN),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_UpDownProc);
-        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_VSCROLLBAR)
-            MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc);
+        if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_BUTTON)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_BUTTON),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ButtonProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_CHECKBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_CheckBoxProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_COMBOBOX)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_COMBOBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ComboBoxProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_EDIT),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_EditProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_GROUPBOX)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_GROUPBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_GroupBoxProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_HSCROLLBAR)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_IMAGEBOX)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_IMAGEBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ImageBoxProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListBoxProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTVIEW)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTVIEW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListViewProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_PROGRESSBAR)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_PROGRESSBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ProgressBarProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_RADIOBUTTON),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_RadioButtonProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_STATIC),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_StaticProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TRACKBAR)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TRACKBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_TrackBarProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TREEVIEW)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TREEVIEW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_TreeViewProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_UPDOWN)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_UPDOWN),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_UpDownProc);
+        else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_VSCROLLBAR)
+            MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc);
 
         ScrollInfo.cbSize=sizeof(SCROLLINFO);
         ScrollInfo.fMask=SIF_POS;
         ScrollInfo.nPos=0;
-        SetScrollInfo(MdiInfo[WndNum].MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
-
-        GetClientRect(MdiInfo[WndNum].MdiRadInfo->hProperty,&rect);
-        SendMessage(MdiInfo[WndNum].MdiRadInfo->hProperty,WM_SIZE,0,MAKELONG(rect.right,rect.bottom));
+        SetScrollInfo(MdiInfo[WndNum]->MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
+
+        GetClientRect(MdiInfo[WndNum]->MdiRadInfo->hProperty,&rect);
+        SendMessage(MdiInfo[WndNum]->MdiRadInfo->hProperty,WM_SIZE,0,MAKELONG(rect.right,rect.bottom));
     }
 }
@@ -599 +600 @@
             (pWindowInfo->childWindowInfos[i]->GetStyle()&0x000F)!=CBS_SIMPLE){
             //コンボ ボックスの場合は表示部分をターゲットに選択する（高さ20pixel）
-            if(x>=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&&
-                x<=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx&&
-                y>=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y&&
-                y<=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+20){
+            if(x>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&&
+                x<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx&&
+                y>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y&&
+                y<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+20){
                 break;
             }
@@ -609 +610 @@
             //グループ ボックスの場合は中央をあける
             if((
-                x>=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&&
-                x<=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx&&
-                y>=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y&&
-                y<=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy
+                x>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&&
+                x<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx&&
+                y>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y&&
+                y<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy
                 )&&
                 (!(
-                x>=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+LEVER_THICK*2&&
-                x<=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx-LEVER_THICK*2&&
-                y>=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+LEVER_THICK*3&&
-                y<=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy-LEVER_THICK*2
+                x>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+LEVER_THICK*2&&
+                x<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx-LEVER_THICK*2&&
+                y>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+LEVER_THICK*3&&
+                y<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy-LEVER_THICK*2
                 ))
                 ){
@@ -624 +625 @@
             }
         }
-        else if(x>=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&&
-            x<=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx&&
-            y>=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y&&
-            y<=MdiInfo[WndNum].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy){
+        else if(x>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&&
+            x<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx&&
+            y>=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y&&
+            y<=MdiInfo[WndNum]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy){
             break;
         }
@@ -637 +638 @@
     int i;
 
-    for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]=-1;
+    for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i]=-1;
     i=GetItemNumOnMouse(WndNum,WndInfoNum,x,y);
 
     if(i==-1){
-        if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
-            MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]=SELECT_WINDOW;
+        if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
+            MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]=SELECT_WINDOW;
             ChangePropertyWindow(WndNum,WndInfoNum);
         }
     }
     else{
-        MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]=i;
+        MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]=i;
         ChangePropertyWindow(WndNum,WndInfoNum);
     }
@@ -662 +663 @@
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
-    for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]=-1;
+    for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i]=-1;
     RectNaturalFormat(pRect,&rect);
-    if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW) sw=0;
+    if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW) sw=0;
     else sw=1;
     for(i=pWindowInfo->childWindowInfos.size()-1,i2=0;i>=0;i--){
-        if(rect.left <= pWindowInfo->childWindowInfos[i]->pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x&&
-            rect.top <= pWindowInfo->childWindowInfos[i]->pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y&&
-            rect.right >= pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx+MdiInfo[WndNum].MdiRadInfo->ClientPos.x&&
-            rect.bottom >= pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy+MdiInfo[WndNum].MdiRadInfo->ClientPos.y){
-            MdiInfo[WndNum].MdiRadInfo->SelectingItem[i2]=i;
+        if(rect.left <= pWindowInfo->childWindowInfos[i]->pos.x+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x&&
+            rect.top <= pWindowInfo->childWindowInfos[i]->pos.y+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y&&
+            rect.right >= pWindowInfo->childWindowInfos[i]->pos.x+pWindowInfo->childWindowInfos[i]->size.cx+MdiInfo[WndNum]->MdiRadInfo->ClientPos.x&&
+            rect.bottom >= pWindowInfo->childWindowInfos[i]->pos.y+pWindowInfo->childWindowInfos[i]->size.cy+MdiInfo[WndNum]->MdiRadInfo->ClientPos.y){
+            MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i2]=i;
             i2++;
         }
     }
-    if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW||
-        (MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW&&sw)){
+    if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW||
+        (MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW&&sw)){
         ChangePropertyWindow(WndNum,WndInfoNum);
     }
@@ -686 +687 @@
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
-    if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1){
+    if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[1]!=-1){
         i=0;
-        while(MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]!=-1||i==0){
+        while(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i]!=-1||i==0){
             GetSelectingRect(WndNum,WndInfoNum,i,&rect);
 
             if(x>=rect.left+LEVER_THICK&&x<=rect.right-LEVER_THICK&&
                 y>=rect.top+LEVER_THICK&&y<=rect.bottom-LEVER_THICK){
-                    if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]]->Control==CT_GROUPBOX){
+                    if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i]]->Control==CT_GROUPBOX){
                     //グループボックスの場合は中央をあける
                     if(!(x>=rect.left+LEVER_THICK*2&&x<=rect.right-LEVER_THICK*2&&
@@ -708 +709 @@
         GetSelectingRect(WndNum,WndInfoNum,0,&rect);
 
-        if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
+        if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
             if(x>=rect.left+LEVER_THICK&&x<=rect.right-LEVER_THICK&&
                 y>=rect.top+LEVER_THICK&&y<=rect.bottom-LEVER_THICK){
-                if(pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->Control==CT_GROUPBOX){
+                if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_GROUPBOX){
                     //グループ ボックスの場合は中央をあける
                     if(!(x>=rect.left+LEVER_THICK*3&&x<=rect.right-LEVER_THICK*3&&
@@ -744 +745 @@
     SIZE NeedSize;
 
-    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
 
     //必要な幅、高さを共に100ピクセル余裕を持たせる
@@ -754 +755 @@
 
     //垂直スクロールバーの設定
-    GetScrollInfo(MdiInfo[WndNum].MdiRadInfo->hRad,SB_VERT,&ScrollInfo);
+    GetScrollInfo(MdiInfo[WndNum]->MdiRadInfo->hRad,SB_VERT,&ScrollInfo);
     ScrollInfo.nMin=0;
     if(height>NeedSize.cy) ScrollInfo.nMax=0;
@@ -761 +762 @@
         ScrollInfo.nPage=height;
     }
-    SetScrollInfo(MdiInfo[WndNum].MdiRadInfo->hRad,SB_VERT,&ScrollInfo,1);
+    SetScrollInfo(MdiInfo[WndNum]->MdiRadInfo->hRad,SB_VERT,&ScrollInfo,1);
 
     //水平スクロールバーの設定
-    GetScrollInfo(MdiInfo[WndNum].MdiRadInfo->hRad,SB_VERT,&ScrollInfo);
+    GetScrollInfo(MdiInfo[WndNum]->MdiRadInfo->hRad,SB_VERT,&ScrollInfo);
     ScrollInfo.nMin=0;
     if(weight>NeedSize.cx) ScrollInfo.nMax=0;
@@ -771 +772 @@
         ScrollInfo.nPage=weight;
     }
-    SetScrollInfo(MdiInfo[WndNum].MdiRadInfo->hRad,SB_HORZ,&ScrollInfo,1);
+    SetScrollInfo(MdiInfo[WndNum]->MdiRadInfo->hRad,SB_HORZ,&ScrollInfo,1);
 }
 LRESULT CALLBACK RadWindow(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
@@ -797 +798 @@
 
                 i=GetWndNum(GetParent(hwnd));
-                i2 = GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
+                i2 = GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(((wParam&MK_CONTROL)||(wParam&MK_SHIFT))&&
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
 
                         //Shiftキー、Ctrlキーによる複数選択
                         for(i3=0;;i3++){
-                            if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1){
-                                MdiInfo[i].MdiRadInfo->SelectingItem[i3]=GetItemNumOnMouse(i,i2,mouse.x,mouse.y);
+                            if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1){
+                                MdiInfo[i]->MdiRadInfo->SelectingItem[i3]=GetItemNumOnMouse(i,i2,mouse.x,mouse.y);
                                 InvalidateRect(hwnd,NULL,0);
 
@@ -826 +827 @@
                             //アイテム選択中。サイズ、位置変更開始
 
-                            if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+                            if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
                                 RadInfo.DraggingRect[0].left=LEVER_THICK;
                                 RadInfo.DraggingRect[0].top=LEVER_THICK;
@@ -835 +836 @@
                             else{
                                 i3=0;
-                                while(MdiInfo[i].MdiRadInfo->SelectingItem[i3]!=-1){
-                                    RadInfo.DraggingRect[i3].left=MdiInfo[i].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.x;
-                                    RadInfo.DraggingRect[i3].top=MdiInfo[i].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.y;
-                                    RadInfo.DraggingRect[i3].right=MdiInfo[i].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.x+pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size.cx;
-                                    RadInfo.DraggingRect[i3].bottom=MdiInfo[i].MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.y+pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size.cy;
+                                while(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]!=-1){
+                                    RadInfo.DraggingRect[i3].left=MdiInfo[i]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.x;
+                                    RadInfo.DraggingRect[i3].top=MdiInfo[i]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.y;
+                                    RadInfo.DraggingRect[i3].right=MdiInfo[i]->MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.x+pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size.cx;
+                                    RadInfo.DraggingRect[i3].bottom=MdiInfo[i]->MdiRadInfo->ClientPos.y+pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.y+pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size.cy;
                                     RadInfo.DragStartRect[i3]=RadInfo.DraggingRect[i3];
                                     i3++;
@@ -877 +878 @@
                 hParent=GetParent(hwnd);
                 i=GetWndNum(hParent);
-                i2 = GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
+                i2 = GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(RadInfo.NowDragging){
                         if(RadInfo.DragStartPos.x==mouse.x&&RadInfo.DragStartPos.y==mouse.y){
@@ -889 +890 @@
                         }
 
-                        if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+                        if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
                             if(RadInfo.NowDragging==SELECTING_FRAME){
                                 SetItemNumOnFrame(i,i2,&RadInfo.DraggingRect[0]);
@@ -897 +898 @@
                                 //ウィンドウ枠の調整完了
                                 PointAndSize.size=pWindowInfo->size;
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
                                 pWindowInfo->size.cx=RadInfo.DraggingRect[0].right-LEVER_THICK;
                                 pWindowInfo->size.cy=RadInfo.DraggingRect[0].bottom-LEVER_THICK;
@@ -909 +910 @@
                         else{
                             i3=0;
-                            while(MdiInfo[i].MdiRadInfo->SelectingItem[i3]!=-1){
+                            while(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]!=-1){
                                 //アイテム枠の調整完了
-                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos;
-                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size;
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.x=RadInfo.DraggingRect[i3].left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.y=RadInfo.DraggingRect[i3].top-MdiInfo[i].MdiRadInfo->ClientPos.y;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size.cx=RadInfo.DraggingRect[i3].right-RadInfo.DraggingRect[i3].left;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size.cy=RadInfo.DraggingRect[i3].bottom-RadInfo.DraggingRect[i3].top;
+                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos;
+                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.x=RadInfo.DraggingRect[i3].left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.y=RadInfo.DraggingRect[i3].top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size.cx=RadInfo.DraggingRect[i3].right-RadInfo.DraggingRect[i3].left;
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size.cy=RadInfo.DraggingRect[i3].bottom-RadInfo.DraggingRect[i3].top;
                                 DrawRadWindow(i,pWindowInfo);
                                 i3++;
@@ -930 +931 @@
                 }
                 else if(RadInfo.NowDragging==ITEM_MAKING){
-                    if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_BUTTON){
+                    if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_BUTTON){
                         //ボタン コントロール作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -943 +944 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -961 +962 @@
                         );
                     }
-                    if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_CHECKBOX){
+                    if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_CHECKBOX){
                         //チェック ボックス作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -974 +975 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0]=InsertDlgItem(
                             i,
                             i2,
@@ -994 +995 @@
                         );
                     }
-                    if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_COMBOBOX){
+                    if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_COMBOBOX){
                         //コンボ ボックス作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1007 +1008 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1027 +1028 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_EDIT){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_EDIT){
                         //エディット コントロール作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1040 +1041 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1059 +1060 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_GROUPBOX){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_GROUPBOX){
                         //グループ ボックス作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1072 +1073 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1092 +1093 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_HSCROLLBAR){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_HSCROLLBAR){
                         //水平スクロールバー作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1105 +1106 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0]=InsertDlgItem(
                             i,
                             i2,
@@ -1125 +1126 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_IMAGEBOX){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_IMAGEBOX){
                         //イメージ ボックス作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1138 +1139 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1156 +1157 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTBOX){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_LISTBOX){
                         //リスト ボックス作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1169 +1170 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1188 +1189 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTVIEW){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_LISTVIEW){
                         //リスト ビュー作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1201 +1202 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1220 +1221 @@
                         );
                     }
-                    if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_PROGRESSBAR){
+                    if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_PROGRESSBAR){
                         //プロバレス バー作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1233 +1234 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1252 +1253 @@
                         );
                     }
-                    if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_RADIOBUTTON){
+                    if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_RADIOBUTTON){
                         //ラジオ ボタン作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1265 +1266 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1285 +1286 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_STATIC){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_STATIC){
                         //スタティック コントロール作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1298 +1299 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1318 +1319 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TRACKBAR){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_TRACKBAR){
                         //トラック バー作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1331 +1332 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1351 +1352 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TREEVIEW){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_TREEVIEW){
                         //ツリー ビュー作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1364 +1365 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1384 +1385 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_UPDOWN){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_UPDOWN){
                         //アップ ダウン コントロール作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1397 +1398 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1417 +1418 @@
                         );
                     }
-                    else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_VSCROLLBAR){
+                    else if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_VSCROLLBAR){
                         //垂直スクロールバー作成
                         if(RadInfo.DraggingRect[0].left==mouse.x&&RadInfo.DraggingRect[0].top==mouse.y){
@@ -1430 +1431 @@
                         }
                         RectNaturalFormat(&RadInfo.DraggingRect[0],&rect);
-                        pos.x=rect.left-MdiInfo[i].MdiRadInfo->ClientPos.x;
-                        pos.y=rect.top-MdiInfo[i].MdiRadInfo->ClientPos.y;
+                        pos.x=rect.left-MdiInfo[i]->MdiRadInfo->ClientPos.x;
+                        pos.y=rect.top-MdiInfo[i]->MdiRadInfo->ClientPos.y;
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                        MdiInfo[i]->MdiRadInfo->SelectingItem[0] = InsertDlgItem(
                             i,
                             i2,
@@ -1450 +1451 @@
                         );
                     }
-                    SendMessage(GetWindow(MdiInfo[i].MdiRadInfo->hTools,GW_CHILD),WM_COMMAND,IDC_TOOL_MOUSE,0);
-                    SendMessage(GetWindow(GetWindow(MdiInfo[i].MdiRadInfo->hTools,GW_CHILD),GW_CHILD),TB_CHECKBUTTON,IDC_TOOL_MOUSE,TRUE);
+                    SendMessage(GetWindow(MdiInfo[i]->MdiRadInfo->hTools,GW_CHILD),WM_COMMAND,IDC_TOOL_MOUSE,0);
+                    SendMessage(GetWindow(GetWindow(MdiInfo[i]->MdiRadInfo->hTools,GW_CHILD),GW_CHILD),TB_CHECKBUTTON,IDC_TOOL_MOUSE,TRUE);
                     ChangePropertyWindow(i,i2);
 
                     //複数選択を解除
-                    MdiInfo[i].MdiRadInfo->SelectingItem[1]=-1;
+                    MdiInfo[i]->MdiRadInfo->SelectingItem[1]=-1;
                 }
 
@@ -1471 +1472 @@
                 hParent=GetParent(hwnd);
                 i=GetWndNum(hParent);
-                i2 = GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
+                i2 = GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(wParam&MK_LBUTTON&&RadInfo.NowDragging){
                         ////////////////////////////////////////////////
@@ -1482 +1483 @@
                             if(RadInfo.DraggingRect[0].right-MIN_ITEM_X<=(mouse.x+LEVER_THICK))
                                 RadInfo.DraggingRect[0].left=RadInfo.DraggingRect[0].right-MIN_ITEM_X;
-                            else if(mouse.x+LEVER_THICK<MdiInfo[i].MdiRadInfo->ClientPos.x)
-                                RadInfo.DraggingRect[0].left=MdiInfo[i].MdiRadInfo->ClientPos.x;
+                            else if(mouse.x+LEVER_THICK<MdiInfo[i]->MdiRadInfo->ClientPos.x)
+                                RadInfo.DraggingRect[0].left=MdiInfo[i]->MdiRadInfo->ClientPos.x;
                             else RadInfo.DraggingRect[0].left=mouse.x+LEVER_THICK;
 
                             if(RadInfo.DraggingRect[0].bottom-MIN_ITEM_Y<=(mouse.y+LEVER_THICK))
                                 RadInfo.DraggingRect[0].top=RadInfo.DraggingRect[0].bottom-MIN_ITEM_Y;
-                            else if(mouse.y+LEVER_THICK<MdiInfo[i].MdiRadInfo->ClientPos.y)
-                                RadInfo.DraggingRect[0].top=MdiInfo[i].MdiRadInfo->ClientPos.y;
+                            else if(mouse.y+LEVER_THICK<MdiInfo[i]->MdiRadInfo->ClientPos.y)
+                                RadInfo.DraggingRect[0].top=MdiInfo[i]->MdiRadInfo->ClientPos.y;
                             else RadInfo.DraggingRect[0].top=mouse.y+LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1496 +1497 @@
                             if(mouse.x-LEVER_THICK-MIN_ITEM_X<=RadInfo.DraggingRect[0].left)
                                 RadInfo.DraggingRect[0].right=RadInfo.DraggingRect[0].left+MIN_ITEM_X;
-                            else if(mouse.x>MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx)
-                                RadInfo.DraggingRect[0].right=MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx;
+                            else if(mouse.x>MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx)
+                                RadInfo.DraggingRect[0].right=MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx;
                             else RadInfo.DraggingRect[0].right=mouse.x-LEVER_THICK;
 
                             if(RadInfo.DraggingRect[0].bottom-MIN_ITEM_Y<=(mouse.y+LEVER_THICK)) RadInfo.DraggingRect[0].top=RadInfo.DraggingRect[0].bottom-MIN_ITEM_Y;
-                            else if(mouse.y+LEVER_THICK<MdiInfo[i].MdiRadInfo->ClientPos.y)
-                                RadInfo.DraggingRect[0].top=MdiInfo[i].MdiRadInfo->ClientPos.y;
+                            else if(mouse.y+LEVER_THICK<MdiInfo[i]->MdiRadInfo->ClientPos.y)
+                                RadInfo.DraggingRect[0].top=MdiInfo[i]->MdiRadInfo->ClientPos.y;
                             else RadInfo.DraggingRect[0].top=mouse.y+LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1509 +1510 @@
                             if(RadInfo.DraggingRect[0].right-MIN_ITEM_X<=(mouse.x+LEVER_THICK))
                                 RadInfo.DraggingRect[0].left=RadInfo.DraggingRect[0].right-MIN_ITEM_X;
-                            else if(mouse.x+LEVER_THICK<MdiInfo[i].MdiRadInfo->ClientPos.x)
-                                RadInfo.DraggingRect[0].left=MdiInfo[i].MdiRadInfo->ClientPos.x;
+                            else if(mouse.x+LEVER_THICK<MdiInfo[i]->MdiRadInfo->ClientPos.x)
+                                RadInfo.DraggingRect[0].left=MdiInfo[i]->MdiRadInfo->ClientPos.x;
                             else RadInfo.DraggingRect[0].left=mouse.x+LEVER_THICK;
 
                             if(mouse.y-LEVER_THICK-MIN_ITEM_Y<=RadInfo.DraggingRect[0].top)
                                 RadInfo.DraggingRect[0].bottom=RadInfo.DraggingRect[0].top+MIN_ITEM_Y;
-                            else if(mouse.y>MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy)
-                                RadInfo.DraggingRect[0].bottom=MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy;
+                            else if(mouse.y>MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy)
+                                RadInfo.DraggingRect[0].bottom=MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy;
                             else RadInfo.DraggingRect[0].bottom=mouse.y-LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1523 +1524 @@
                             if(mouse.x-LEVER_THICK-MIN_ITEM_X<=RadInfo.DraggingRect[0].left)
                                 RadInfo.DraggingRect[0].right=RadInfo.DraggingRect[0].left+MIN_ITEM_X;
-                            else if((mouse.x>MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx)&&MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
-                                RadInfo.DraggingRect[0].right=MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx;
+                            else if((mouse.x>MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx)&&MdiInfo[i]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
+                                RadInfo.DraggingRect[0].right=MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx;
                             else RadInfo.DraggingRect[0].right=mouse.x-LEVER_THICK;
 
                             if(mouse.y-LEVER_THICK-MIN_ITEM_Y<=RadInfo.DraggingRect[0].top)
                                 RadInfo.DraggingRect[0].bottom=RadInfo.DraggingRect[0].top+MIN_ITEM_Y;
-                            else if((mouse.y>MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy)&&MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
-                                RadInfo.DraggingRect[0].bottom=MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy;
+                            else if((mouse.y>MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy)&&MdiInfo[i]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
+                                RadInfo.DraggingRect[0].bottom=MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy;
                             else RadInfo.DraggingRect[0].bottom=mouse.y-LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1537 +1538 @@
                             if(RadInfo.DraggingRect[0].right-MIN_ITEM_X<=(mouse.x+LEVER_THICK))
                                 RadInfo.DraggingRect[0].left=RadInfo.DraggingRect[0].right-MIN_ITEM_X;
-                            else if(mouse.x+LEVER_THICK<MdiInfo[i].MdiRadInfo->ClientPos.x)
-                                RadInfo.DraggingRect[0].left=MdiInfo[i].MdiRadInfo->ClientPos.x;
+                            else if(mouse.x+LEVER_THICK<MdiInfo[i]->MdiRadInfo->ClientPos.x)
+                                RadInfo.DraggingRect[0].left=MdiInfo[i]->MdiRadInfo->ClientPos.x;
                             else RadInfo.DraggingRect[0].left=mouse.x+LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1545 +1546 @@
                             if(mouse.x-LEVER_THICK-MIN_ITEM_X<=RadInfo.DraggingRect[0].left)
                                 RadInfo.DraggingRect[0].right=RadInfo.DraggingRect[0].left+MIN_ITEM_X;
-                            else if((mouse.x>MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx)&&MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
-                                RadInfo.DraggingRect[0].right=MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx;
+                            else if((mouse.x>MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx)&&MdiInfo[i]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
+                                RadInfo.DraggingRect[0].right=MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx;
                             else RadInfo.DraggingRect[0].right=mouse.x-LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1553 +1554 @@
                             if(RadInfo.DraggingRect[0].bottom-MIN_ITEM_Y<=(mouse.y+LEVER_THICK))
                                 RadInfo.DraggingRect[0].top=RadInfo.DraggingRect[0].bottom-MIN_ITEM_Y;
-                            else if(mouse.y+LEVER_THICK<MdiInfo[i].MdiRadInfo->ClientPos.y)
-                                RadInfo.DraggingRect[0].top=MdiInfo[i].MdiRadInfo->ClientPos.y;
+                            else if(mouse.y+LEVER_THICK<MdiInfo[i]->MdiRadInfo->ClientPos.y)
+                                RadInfo.DraggingRect[0].top=MdiInfo[i]->MdiRadInfo->ClientPos.y;
                             else RadInfo.DraggingRect[0].top=mouse.y+LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1561 +1562 @@
                             if(mouse.y-LEVER_THICK-MIN_ITEM_Y<=RadInfo.DraggingRect[0].top) 
                                 RadInfo.DraggingRect[0].bottom=RadInfo.DraggingRect[0].top+MIN_ITEM_Y;
-                            else if((mouse.y>MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy)&&MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
-                                RadInfo.DraggingRect[0].bottom=MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy;
+                            else if((mouse.y>MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy)&&MdiInfo[i]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW)
+                                RadInfo.DraggingRect[0].bottom=MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy;
                             else RadInfo.DraggingRect[0].bottom=mouse.y-LEVER_THICK;
                             DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[0],&RadInfo.OldDraggingRect[0],0);
@@ -1568 +1569 @@
                         else if(RadInfo.NowDragging==FRAME_INSIDE){
                             i3=0;
-                            while(MdiInfo[i].MdiRadInfo->SelectingItem[i3]!=-1){
+                            while(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]!=-1){
                                 i4=RadInfo.DragStartRect[i3].left+mouse.x-RadInfo.DragStartPos.x;
 
-                                if(i4>MdiInfo[i].MdiRadInfo->ClientPos.x){
+                                if(i4>MdiInfo[i]->MdiRadInfo->ClientPos.x){
                                     i4=RadInfo.DragStartRect[i3].right+mouse.x-RadInfo.DragStartPos.x;
-                                    if(i4<MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx) i4=0;
-                                    else i4-=MdiInfo[i].MdiRadInfo->ClientPos.x+MdiInfo[i].MdiRadInfo->ClientSize.cx;
+                                    if(i4<MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx) i4=0;
+                                    else i4-=MdiInfo[i]->MdiRadInfo->ClientPos.x+MdiInfo[i]->MdiRadInfo->ClientSize.cx;
                                 }
-                                else i4-=MdiInfo[i].MdiRadInfo->ClientPos.x;
+                                else i4-=MdiInfo[i]->MdiRadInfo->ClientPos.x;
                                 //i4は枠外に出たときのポインタと壁にあたったコントロールとの差
                                 RadInfo.DraggingRect[i3].left=RadInfo.DragStartRect[i3].left+mouse.x-RadInfo.DragStartPos.x-i4;
@@ -1582 +1583 @@
 
                                 i4=RadInfo.DragStartRect[i3].top+mouse.y-RadInfo.DragStartPos.y;
-                                if(i4>MdiInfo[i].MdiRadInfo->ClientPos.y){
+                                if(i4>MdiInfo[i]->MdiRadInfo->ClientPos.y){
                                     i4=RadInfo.DragStartRect[i3].bottom+mouse.y-RadInfo.DragStartPos.y;
-                                    if(i4<MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy) i4=0;
-                                    else i4-=MdiInfo[i].MdiRadInfo->ClientPos.y+MdiInfo[i].MdiRadInfo->ClientSize.cy;
+                                    if(i4<MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy) i4=0;
+                                    else i4-=MdiInfo[i]->MdiRadInfo->ClientPos.y+MdiInfo[i]->MdiRadInfo->ClientSize.cy;
                                 }
-                                else i4-=MdiInfo[i].MdiRadInfo->ClientPos.y;
+                                else i4-=MdiInfo[i]->MdiRadInfo->ClientPos.y;
                                 RadInfo.DraggingRect[i3].top=RadInfo.DragStartRect[i3].top+mouse.y-RadInfo.DragStartPos.y-i4;
                                 RadInfo.DraggingRect[i3].bottom=RadInfo.DragStartRect[i3].bottom+mouse.y-RadInfo.DragStartPos.y-i4;
 
-                                if(MdiInfo[i].MdiRadInfo->SelectingItem[1]==-1) i4=1;
+                                if(MdiInfo[i]->MdiRadInfo->SelectingItem[1]==-1) i4=1;
                                 else i4=0;
                                 DrawFrame(hwnd,i,i2,&RadInfo.DraggingRect[i3],&RadInfo.OldDraggingRect[i3],i4);
@@ -1636 +1637 @@
                 hParent=GetParent(hwnd);
                 i=GetWndNum(hParent);
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
-                    if(MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+                if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
+                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
                         temp2[0]=0;
-                        if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_BUTTON||
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX||
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_IMAGEBOX||
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON||
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC)
+                        if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_BUTTON||
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX||
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_IMAGEBOX||
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON||
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC)
                         {
                             sprintf(temporary,"%s_%s_Click",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str()
                             );
                         }
-                        else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_COMBOBOX)
+                        else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_COMBOBOX)
                         {
                             sprintf(temporary,"%s_%s_EditChange",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                        }
-                        else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT)
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                        }
+                        else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT)
                         {
                             sprintf(temporary,"%s_%s_Change",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                        }
-                        else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX)
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                        }
+                        else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX)
                         {
                             sprintf(temporary,"%s_%s_SelChange",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
                         }
                         else temporary[0]=0;
@@ -1680 +1681 @@
                 hParent=GetParent(hwnd);
                 i=GetWndNum(hParent);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
-                    if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+                if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
+                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
                         PointAndSize.pos=pWindowInfo->pos;
                         PointAndSize.size=pWindowInfo->size;
                         if(GetKeyState(VK_SHIFT)&0x8000){
                             if(wParam==VK_RIGHT||wParam==VK_LEFT||wParam==VK_DOWN||wParam==VK_UP)
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
 
                             if(wParam==VK_RIGHT)
@@ -1709 +1710 @@
                     }
                     else{
-                        PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->pos;
-                        PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size;
+                        PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->pos;
+                        PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size;
                         if(wParam==VK_RIGHT){
                             if(GetKeyState(VK_SHIFT)&0x8000){
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx++;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx++;
                             }
                             else{
                                 for(i3=0;;i3++){
-                                    if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos;
-                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size;
-                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
-
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.x++;
+                                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos;
+                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size;
+                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
+
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.x++;
                                 }
                             }
@@ -1734 +1735 @@
                         else if(wParam==VK_LEFT){
                             if(GetKeyState(VK_SHIFT)&0x8000){
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx--;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx--;
                             }
                             else{
                                 for(i3=0;;i3++){
-                                    if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos;
-                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size;
-                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
-
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.x--;
+                                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos;
+                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size;
+                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
+
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.x--;
                                 }
                             }
@@ -1755 +1756 @@
                         else if(wParam==VK_UP){
                             if(GetKeyState(VK_SHIFT)&0x8000){
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cy--;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cy--;
                             }
                             else{
                                 for(i3=0;;i3++){
-                                    if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos;
-                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size;
-                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
-
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.y--;
+                                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos;
+                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size;
+                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
+
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.y--;
                                 }
                             }
@@ -1776 +1777 @@
                         else if(wParam==VK_DOWN){
                             if(GetKeyState(VK_SHIFT)&0x8000){
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cy++;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cy++;
                             }
                             else{
                                 for(i3=0;;i3++){
-                                    if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos;
-                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size;
-                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
-
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.y++;
+                                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                                    PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos;
+                                    PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size;
+                                    Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
+
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.y++;
                                 }
                             }
@@ -1803 +1804 @@
         case WM_SETFOCUS:
             i=GetWndNum(GetParent(hwnd));
-            if(MdiInfo[i].MdiRadInfo->ButtonSelect==NON_TOOL)
-                MdiInfo[i].MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
+            if(MdiInfo[i]->MdiRadInfo->ButtonSelect==NON_TOOL)
+                MdiInfo[i]->MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
             InvalidateRect(hwnd,NULL,0);
             return 0;
@@ -1810 +1811 @@
             i=GetWndNum(GetParent(hwnd));
             if(i==-1) return 0; //ウィンドウが破棄された場合
-            if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE)
-                MdiInfo[i].MdiRadInfo->ButtonSelect=NON_TOOL;
+            if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE)
+                MdiInfo[i]->MdiRadInfo->ButtonSelect=NON_TOOL;
             InvalidateRect(hwnd,NULL,0);
             return 0;
@@ -1817 +1818 @@
             i=GetWndNum(GetParent(hwnd));
             if(i==-1) return 0; //ウィンドウが初期状態の場合
-            i2=GetWndInfoNum(MdiInfo[i].path);
+            i2=GetWndInfoNum(MdiInfo[i]->path);
 
             ScrollInfo.cbSize=sizeof(SCROLLINFO);
@@ -1828 +1829 @@
             hdc=BeginPaint(hwnd,&ps);
             BitBlt(hdc,0,0,ScreenX*2,ScreenY*2,
-                MdiInfo[i].MdiRadInfo->hMemDC,si2.nPos,ScrollInfo.nPos,SRCCOPY);
+                MdiInfo[i]->MdiRadInfo->hMemDC,si2.nPos,ScrollInfo.nPos,SRCCOPY);
             EndPaint(hwnd,&ps);
 
-            if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE||MdiInfo[i].MdiRadInfo->ButtonSelect==NON_TOOL)
-                DrawSelectingRect(hwnd,i,i2,MdiInfo[i].MdiRadInfo->ButtonSelect);
+            if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE||MdiInfo[i]->MdiRadInfo->ButtonSelect==NON_TOOL)
+                DrawSelectingRect(hwnd,i,i2,MdiInfo[i]->MdiRadInfo->ButtonSelect);
             return 0;
         case WM_CONTEXTMENU:
@@ -1841 +1842 @@
             SetFocus(hwnd);
             i=GetWndNum(hParent);
-            i2=GetWndInfoNum(MdiInfo[i].path);
-
-            if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
+            i2=GetWndInfoNum(MdiInfo[i]->path);
+
+            if(MdiInfo[i]->MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                 mouse.x=LOWORD(lParam);
                 mouse.y=HIWORD(lParam);
@@ -1851 +1852 @@
                 InvalidateRect(hwnd,NULL,0);
                 extern HMENU hRadMenuBase;
-                if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
                     TrackPopupMenu(GetSubMenu(hRadMenuBase,0),TPM_LEFTALIGN,LOWORD(lParam),HIWORD(lParam),0,hwnd,0);
                 else TrackPopupMenu(GetSubMenu(hRadMenuBase,1),TPM_LEFTALIGN,LOWORD(lParam),HIWORD(lParam),0,hwnd,0);
@@ -1869 +1870 @@
                     hParent=GetParent(hwnd);
                     i=GetWndNum(hParent);
-                    i2=GetWndInfoNum(MdiInfo[i].path);
+                    i2=GetWndInfoNum(MdiInfo[i]->path);
 
                     //削除順序を考慮しなければならないので、バブルソートを行う
                     int i5,i6;
                     for(i5=0;;i5++){
-                        if(MdiInfo[i].MdiRadInfo->SelectingItem[i5]==-1) break;
+                        if(MdiInfo[i]->MdiRadInfo->SelectingItem[i5]==-1) break;
                     }
                     for(i3=0;i3<i5-1;i3++){
                         for(i4=i5-1;i4>i3;i4--){
-                            if(MdiInfo[i].MdiRadInfo->SelectingItem[i4] >
-                                MdiInfo[i].MdiRadInfo->SelectingItem[i4-1]){
-                                i6=MdiInfo[i].MdiRadInfo->SelectingItem[i4];
-                                MdiInfo[i].MdiRadInfo->SelectingItem[i4]=
-                                    MdiInfo[i].MdiRadInfo->SelectingItem[i4-1];
-                                MdiInfo[i].MdiRadInfo->SelectingItem[i4-1]=i6;
+                            if(MdiInfo[i]->MdiRadInfo->SelectingItem[i4] >
+                                MdiInfo[i]->MdiRadInfo->SelectingItem[i4-1]){
+                                i6=MdiInfo[i]->MdiRadInfo->SelectingItem[i4];
+                                MdiInfo[i]->MdiRadInfo->SelectingItem[i4]=
+                                    MdiInfo[i]->MdiRadInfo->SelectingItem[i4-1];
+                                MdiInfo[i]->MdiRadInfo->SelectingItem[i4-1]=i6;
                             }
                         }
@@ -1890 +1891 @@
 
                     for(i3=0;;i3++){
-                        if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                        DeleteDlgItem(i,i2,MdiInfo[i].MdiRadInfo->SelectingItem[i3],1);
-                    }
-                    for(i3=0;i3<MAX_RAD_SELITEM;i3++) MdiInfo[i].MdiRadInfo->SelectingItem[i3]=-1;
+                        if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                        DeleteDlgItem(i,i2,MdiInfo[i]->MdiRadInfo->SelectingItem[i3],1);
+                    }
+                    for(i3=0;i3<MAX_RAD_SELITEM;i3++) MdiInfo[i]->MdiRadInfo->SelectingItem[i3]=-1;
 
                     ResetState_EditMenu();
@@ -1955 +1956 @@
     else{
         //ツールボタンウィンドウ(長さ、i)
-        GetClientRect(GetWindow(MdiInfo[WndNum].MdiRadInfo->hTools,GW_CHILD),&rect);
+        GetClientRect(GetWindow(MdiInfo[WndNum]->MdiRadInfo->hTools,GW_CHILD),&rect);
         if(height>rect.bottom+1) i=rect.bottom+1;
         else i=height;
 
         //プロパティウィンドウ(長さ、i2)
-        GetClientRect(GetWindow(MdiInfo[WndNum].MdiRadInfo->hProperty,GW_CHILD),&rect);
+        GetClientRect(GetWindow(MdiInfo[WndNum]->MdiRadInfo->hProperty,GW_CHILD),&rect);
         i2=height-i;
 
@@ -1968 +1969 @@
         }
     }
-    MoveWindow(MdiInfo[WndNum].MdiRadInfo->hTools,weight-172,0,172,i,1);
-    MoveWindow(MdiInfo[WndNum].MdiRadInfo->hProperty,weight-172,i,172,i2,1);
-
-    GetWindowRect(MdiInfo[WndNum].MdiRadInfo->hSupport,&rect);
+    MoveWindow(MdiInfo[WndNum]->MdiRadInfo->hTools,weight-172,0,172,i,1);
+    MoveWindow(MdiInfo[WndNum]->MdiRadInfo->hProperty,weight-172,i,172,i2,1);
+
+    GetWindowRect(MdiInfo[WndNum]->MdiRadInfo->hSupport,&rect);
     rect.right-=rect.left;
     rect.bottom-=rect.top;
 
     //RADウィンドウ
-    MoveWindow(MdiInfo[WndNum].MdiRadInfo->hRad,0,0,weight-172,height-rect.bottom,1);
+    MoveWindow(MdiInfo[WndNum]->MdiRadInfo->hRad,0,0,weight-172,height-rect.bottom,1);
 
     //サポートウィンドウ
-    MoveWindow(MdiInfo[WndNum].MdiRadInfo->hSupport,0,height-rect.bottom,weight-172,rect.bottom,1);
+    MoveWindow(MdiInfo[WndNum]->MdiRadInfo->hSupport,0,height-rect.bottom,weight-172,rect.bottom,1);
 }
 LRESULT CALLBACK MDIClientWindow_Rad(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
@@ -1995 +1996 @@
             if(i==-1) return 0; //ウィンドウが初期状態の場合
 
-            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i].title.c_str());
+            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i,0);
             SetStatusText(NULL);

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

@@ -195 +195 @@
     bSupportDlg_NoChange=1;
 
-    hSupport=MdiInfo[WndNum].MdiRadInfo->hSupport;
+    hSupport=MdiInfo[WndNum]->MdiRadInfo->hSupport;
 
     if(RadInfo.NowDragging>=FRAME_CHANGEPOS_START&&RadInfo.NowDragging<=FRAME_CHANGEPOS_END&&
-        (!(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]!=-1&&MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1))){
-        sprintf(temporary,"%d",RadInfo.DraggingRect[0].left-MdiInfo[WndNum].MdiRadInfo->ClientPos.x);
+        (!(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]!=-1&&MdiInfo[WndNum]->MdiRadInfo->SelectingItem[1]!=-1))){
+        sprintf(temporary,"%d",RadInfo.DraggingRect[0].left-MdiInfo[WndNum]->MdiRadInfo->ClientPos.x);
         SetDlgItemText(hSupport,IDC_XPOS,temporary);
 
-        sprintf(temporary,"%d",RadInfo.DraggingRect[0].top-MdiInfo[WndNum].MdiRadInfo->ClientPos.y);
+        sprintf(temporary,"%d",RadInfo.DraggingRect[0].top-MdiInfo[WndNum]->MdiRadInfo->ClientPos.y);
         SetDlgItemText(hSupport,IDC_YPOS,temporary);
 
@@ -211 +211 @@
         SetDlgItemText(hSupport,IDC_HEIGHT,temporary);
     }
-    else if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+    else if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
         EnableWindow(GetDlgItem(hSupport,IDC_XPOS),0);
         EnableWindow(GetDlgItem(hSupport,IDC_YPOS),0);
@@ -232 +232 @@
         EnableWindow(GetDlgItem(hSupport,IDC_YPOS),1);
 
-        if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1){
+        if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[1]!=-1){
             EnableWindow(GetDlgItem(hSupport,IDC_SPIN1),0);
             EnableWindow(GetDlgItem(hSupport,IDC_SPIN2),0);
@@ -249 +249 @@
             EnableWindow(GetDlgItem(hSupport,IDC_SPIN4),1);
 
-            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.x);
+            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.x);
             SetDlgItemText(hSupport,IDC_XPOS,temporary);
 
-            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.y);
+            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.y);
             SetDlgItemText(hSupport,IDC_YPOS,temporary);
 
-            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->size.cx);
+            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->size.cx);
             SetDlgItemText(hSupport,IDC_WIDTH,temporary);
 
-            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->size.cy);
+            sprintf(temporary,"%d",windowInfo.childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->size.cy);
             SetDlgItemText(hSupport,IDC_HEIGHT,temporary);
         }
@@ -291 +291 @@
                         (void (__cdecl *)(void *))ShowTestWindow,
                         0,
-                        (void *)GetWndInfoNum(MdiInfo[GetWndNum(GetParent(hwnd))].path));
+                        (void *)GetWndInfoNum(MdiInfo[GetWndNum(GetParent(hwnd))]->path));
                     return 1;
                 case IDC_XPOS:
@@ -313 +313 @@
 
             i=GetWndNum(GetParent(hwnd));
-            ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+            ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
             for(i3=0;;i3++){
-                if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos;
-                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size;
-                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
+                if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos;
+                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size;
+                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[i3],(DWORD)&PointAndSize);
             }
 
@@ -325 +325 @@
             if(temporary[0]){
                 for(i3=0;;i3++){
-                    if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.x=atol(temporary);
+                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.x=atol(temporary);
                 }
             }
@@ -333 +333 @@
             if(temporary[0]){
                 for(i3=0;;i3++){
-                    if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->pos.y=atol(temporary);
+                    if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->pos.y=atol(temporary);
                 }
             }
@@ -340 +340 @@
             GetDlgItemText(hwnd,IDC_WIDTH,temporary,255);
             if(temporary[0]){
-                if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
                     pWindowInfo->size.cx=atol(temporary);
                 else{
                     for(i3=0;;i3++){
-                        if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size.cx=atol(temporary);
+                        if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                        pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size.cx=atol(temporary);
                     }
                 }
@@ -352 +352 @@
             GetDlgItemText(hwnd,IDC_HEIGHT,temporary,255);
             if(temporary[0]){
-                if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
                     pWindowInfo->size.cy=atol(temporary);
                 else{
                     for(i3=0;;i3++){
-                        if(MdiInfo[i].MdiRadInfo->SelectingItem[i3]==-1) break;
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[i3]]->size.cy=atol(temporary);
+                        if(MdiInfo[i]->MdiRadInfo->SelectingItem[i3]==-1) break;
+                        pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[i3]]->size.cy=atol(temporary);
                     }
                 }
@@ -366 +366 @@
 
             //スクロールバーをリセット
-            GetClientRect(MdiInfo[i].MdiRadInfo->hRad,&rect);
+            GetClientRect(MdiInfo[i]->MdiRadInfo->hRad,&rect);
             ResetScrollbarOfRadEditor(i,rect.right,rect.bottom);
 

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

@@ -153 +153 @@
                     BringWindowToTop(hParent);
                     i=GetWndNum(hParent);
-                    i2=GetWndInfoNum(MdiInfo[i].path);
-                    MdiInfo[i].MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
-                    DrawSelectingRect(MdiInfo[i].MdiRadInfo->hRad,i,i2,IDC_TOOL_MOUSE);
-                    SetFocus(MdiInfo[i].MdiRadInfo->hRad);
+                    i2=GetWndInfoNum(MdiInfo[i]->path);
+                    MdiInfo[i]->MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
+                    DrawSelectingRect(MdiInfo[i]->MdiRadInfo->hRad,i,i2,IDC_TOOL_MOUSE);
+                    SetFocus(MdiInfo[i]->MdiRadInfo->hRad);
                     return 1;
                 case IDC_TOOL_BUTTON:
@@ -178 +178 @@
                     BringWindowToTop(hParent);
                     WndNum=GetWndNum(hParent);
-                    MdiInfo[WndNum].MdiRadInfo->ButtonSelect=LOWORD(wParam);
-                    InvalidateRect(MdiInfo[WndNum].MdiRadInfo->hRad,NULL,0);
+                    MdiInfo[WndNum]->MdiRadInfo->ButtonSelect=LOWORD(wParam);
+                    InvalidateRect(MdiInfo[WndNum]->MdiRadInfo->hRad,NULL,0);
                     return 1;
             }
@@ -357 +357 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
                 SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str());
                 SetDlgItemText(hwnd,IDC_WINDOWHANDLE,( "h" + pWindowInfo->GetName() ).c_str());
@@ -384 +384 @@
 
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         RAD_UNDOSTATE_NAME names,NoticeNames;
@@ -406 +406 @@
 
                         pWindowInfo->SetName( names.name );
-                        MdiInfo[i].path = names.name;
+                        MdiInfo[i]->path = names.name;
 
                         EndDialog(hwnd,1);
@@ -442 +442 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
                 if(pWindowInfo->GetExStyle()&WS_EX_TOPMOST) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOPMOST,BM_SETCHECK,BST_CHECKED,0);
                 if(pWindowInfo->GetExStyle()&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
@@ -481 +481 @@
                             style|=WS_EX_CONTROLPARENT;
 
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         if(style==pWindowInfo->GetExStyle()){
@@ -513 +513 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str());
@@ -675 +675 @@
                         if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,(DLGPROC)DlgRadProperty_Window_Rename)) return 1;
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
                         SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str());
                         SetDlgItemText(hwnd,IDC_HANDLE,pWindowInfo->GetHandleName().c_str());
@@ -684 +684 @@
                         if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1;
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
                         SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str());
                         return 1;
@@ -691 +691 @@
                     {
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
                         LOGFONT lf;
                         lf=pWindowInfo->LogFont;
@@ -706 +706 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         i3=SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_GETCURSEL,0,0);
@@ -782 +782 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -806 +806 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -830 +830 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -851 +851 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -875 +875 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -894 +894 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -910 +910 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -926 +926 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -942 +942 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -958 +958 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -973 +973 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -988 +988 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -1004 +1004 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -1020 +1020 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -1036 +1036 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -1052 +1052 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -1069 +1069 @@
                     if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Window_ExStyle)) return 1;
                     i=GetWndNum(GetParent(GetParent(hwnd)));
-                    DrawRadWindow(i,GetWndInfo(MdiInfo[i].path));
+                    DrawRadWindow(i,GetWndInfo(MdiInfo[i]->path));
                     return 1;
 
@@ -1077 +1077 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         //変更情報
@@ -1114 +1114 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+                if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
                     SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str());
                 else
-                    SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                    SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
                 break;
             }
@@ -1126 +1126 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_CAPTION))+1;
                         temporary=(char *)HeapAlloc(hHeap,0,i3);
                         GetDlgItemText(hwnd,IDC_CAPTION,temporary,i3);
-                        if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+                        if(MdiInfo[i]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
                             if( pWindowInfo->GetCaption() == temporary){
                                 HeapDefaultFree(temporary);
@@ -1139 +1139 @@
 
                             //変更情報を更新
-                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->GetCaption());
+                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->GetCaption());
 
                             pWindowInfo->SetCaption( temporary );
                         }
                         else{
-                            if( pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption() == temporary )
+                            if( pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption() == temporary )
                             {
                                 HeapDefaultFree(temporary);
@@ -1152 +1152 @@
 
                             //変更情報を更新
-                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption());
-
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetCaption( temporary );
-
-                            if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC){
+                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption());
+
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetCaption( temporary );
+
+                            if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC){
                                 //スタティック テキスト
                                 //テキストが表示できるようにサイズを拡大する
 
-                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->pos;
-                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size;
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->pos;
+                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
 
                                 HFONT hFont,hOldFont;
                                 hFont=CreateFontIndirect(&pWindowInfo->LogFont);
-                                hOldFont=(HFONT)SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,hFont);
-                                GetTextExtentPoint32(MdiInfo[i].MdiRadInfo->hMemDC,temporary,lstrlen(temporary),&PointAndSize.size);
-                                SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,hOldFont);
+                                hOldFont=(HFONT)SelectObject(MdiInfo[i]->MdiRadInfo->hMemDC,hFont);
+                                GetTextExtentPoint32(MdiInfo[i]->MdiRadInfo->hMemDC,temporary,lstrlen(temporary),&PointAndSize.size);
+                                SelectObject(MdiInfo[i]->MdiRadInfo->hMemDC,hOldFont);
                                 DeleteObject(hFont);
 
@@ -1174 +1174 @@
                                 PointAndSize.size.cx+=5;
 
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx<PointAndSize.size.cx)
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx=PointAndSize.size.cx;
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx<PointAndSize.size.cx)
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx=PointAndSize.size.cx;
                             }
-                            if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX){
+                            if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX){
                                 //チェック ボックス
                                 //テキストが表示できるようにサイズを拡大する
 
-                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->pos;
-                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size;
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->pos;
+                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
 
                                 HFONT hFont,hOldFont;
                                 hFont=CreateFontIndirect(&pWindowInfo->LogFont);
-                                hOldFont=(HFONT)SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,hFont);
-                                GetTextExtentPoint32(MdiInfo[i].MdiRadInfo->hMemDC,temporary,lstrlen(temporary),&PointAndSize.size);
-                                SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,hOldFont);
+                                hOldFont=(HFONT)SelectObject(MdiInfo[i]->MdiRadInfo->hMemDC,hFont);
+                                GetTextExtentPoint32(MdiInfo[i]->MdiRadInfo->hMemDC,temporary,lstrlen(temporary),&PointAndSize.size);
+                                SelectObject(MdiInfo[i]->MdiRadInfo->hMemDC,hOldFont);
                                 DeleteObject(hFont);
 
@@ -1195 +1195 @@
                                 PointAndSize.size.cx+=21;
 
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx<PointAndSize.size.cx)
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx=PointAndSize.size.cx;
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx<PointAndSize.size.cx)
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx=PointAndSize.size.cx;
                             }
-                            if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON){
+                            if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON){
                                 //ラジオ ボックス
                                 //テキストが表示できるようにサイズを拡大する
 
-                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->pos;
-                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size;
-                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
+                                PointAndSize.pos=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->pos;
+                                PointAndSize.size=pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size;
+                                Rad_NoticeChanging(i,RAD_UNDO_POSITION,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&PointAndSize);
 
                                 HFONT hFont,hOldFont;
                                 hFont=CreateFontIndirect(&pWindowInfo->LogFont);
-                                hOldFont=(HFONT)SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,hFont);
-                                GetTextExtentPoint32(MdiInfo[i].MdiRadInfo->hMemDC,temporary,lstrlen(temporary),&PointAndSize.size);
-                                SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,hOldFont);
+                                hOldFont=(HFONT)SelectObject(MdiInfo[i]->MdiRadInfo->hMemDC,hFont);
+                                GetTextExtentPoint32(MdiInfo[i]->MdiRadInfo->hMemDC,temporary,lstrlen(temporary),&PointAndSize.size);
+                                SelectObject(MdiInfo[i]->MdiRadInfo->hMemDC,hOldFont);
                                 DeleteObject(hFont);
 
@@ -1216 +1216 @@
                                 PointAndSize.size.cx+=20;
 
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx<PointAndSize.size.cx)
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->size.cx=PointAndSize.size.cx;
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx<PointAndSize.size.cx)
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->size.cx=PointAndSize.size.cx;
                             }
                         }
@@ -1245 +1245 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
             }
             break;
@@ -1254 +1254 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_IDNAME))+1;
@@ -1264 +1264 @@
                         temporary=(char *)HeapAlloc(hHeap,0,i3);
                         GetDlgItemText(hwnd,IDC_IDNAME,temporary,i3);
-                        if( pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName() == temporary )
+                        if( pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName() == temporary )
                         {
                             HeapDefaultFree(temporary);
@@ -1275 +1275 @@
 
                         //変更情報を更新
-                        Rad_NoticeChanging(i,RAD_UNDO_NAME,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName());
-
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetName( temporary );
+                        Rad_NoticeChanging(i,RAD_UNDO_NAME,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName());
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetName( temporary );
 
                         EndDialog(hwnd,1);
@@ -1298 +1298 @@
         case IDC_RENAMEID:
             if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd,(DLGPROC)DlgRadProperty_Item_RenameID)) return 1;
-            SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+            SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
             return 1;
         case IDC_RENAMECAPTION:
             if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1;
-            SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+            SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
             return 1;
         case IDC_STYLE_DISABLED:
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_DISABLED );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_DISABLED );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_DISABLED );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_DISABLED );
                 DrawRadWindow(WndNum,pWindowInfo);
                 return 1;
@@ -1320 +1320 @@
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VISIBLE );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VISIBLE );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VISIBLE );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VISIBLE );
                 return 1;
             }
@@ -1332 +1332 @@
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_GROUP );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_GROUP );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_GROUP );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_GROUP );
                 return 1;
             }
@@ -1344 +1344 @@
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_TABSTOP );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_TABSTOP );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_TABSTOP );
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_TABSTOP );
                 return 1;
             }
@@ -1364 +1364 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_DLGMODALFRAME) SendDlgItemMessage(hwnd,IDC_EXSTYLE_DLGMODALFRAME,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_DLGMODALFRAME) SendDlgItemMessage(hwnd,IDC_EXSTYLE_DLGMODALFRAME,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);
                 break;
             }
@@ -1377 +1377 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                         DWORD style;
@@ -1392 +1392 @@
                             style|=WS_EX_STATICEDGE;
 
-                        if(style==pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()){
+                        if(style==pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()){
                             SendMessage(hwnd,WM_COMMAND,IDCANCEL,0);
                             return 1;
@@ -1398 +1398 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle());
-
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetExStyle( style );
+                        Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle());
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetExStyle( style );
                         EndDialog(hwnd,1);
                         return 1;
@@ -1426 +1426 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -1435 +1435 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_OWNERDRAW)==BS_OWNERDRAW) SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_CHECKED,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_DEFPUSHBUTTON) SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_OWNERDRAW)==BS_OWNERDRAW) SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_CHECKED,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_DEFPUSHBUTTON) SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -1463 +1463 @@
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0);
 
@@ -1483 +1483 @@
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0);
 
@@ -1496 +1496 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
                 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
 
@@ -1508 +1508 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_DEFPUSHBUTTON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_DEFPUSHBUTTON );
                                 SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1524 +1524 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_OWNERDRAW );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_OWNERDRAW );
                                 SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1540 +1540 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                                 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1556 +1556 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                                 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1572 +1572 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1585 +1585 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -1598 +1598 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1612 +1612 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1647 +1647 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -1656 +1656 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTOCHECKBOX)==BS_AUTOCHECKBOX) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTO3STATE)==BS_AUTO3STATE){
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTOCHECKBOX)==BS_AUTOCHECKBOX) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTO3STATE)==BS_AUTO3STATE){
                     SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
                     SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0);
                 }
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_3STATE)==BS_3STATE) SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_3STATE)==BS_3STATE) SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -1689 +1689 @@
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0);
 
@@ -1709 +1709 @@
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0);
 
@@ -1722 +1722 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
                 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
 
@@ -1734 +1734 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_GETCHECK,0,0)){
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){
                                     //3state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE );
                                 }
                                 else{
                                     //2state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX );
                                 }
                             }
                             else{
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){
                                     //3state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE );
                                 }
                                 else{
                                     //2state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX );
                                 }
                             }
@@ -1766 +1766 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_GETCHECK,0,0)){
-                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_CHECKBOX){
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE );
+                                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_CHECKBOX){
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE );
                                 }
-                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTOCHECKBOX){
+                                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTOCHECKBOX){
                                     //自動チェック
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE );
                                 }
                             }
                             else{
-                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_3STATE){
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX );
+                                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_3STATE){
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX );
                                 }
-                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTO3STATE){
+                                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTO3STATE){
                                     //自動チェック
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX );
                                 }
                             }
@@ -1796 +1796 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_PUSHLIKE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_PUSHLIKE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_PUSHLIKE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_PUSHLIKE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1809 +1809 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFTTEXT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFTTEXT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFTTEXT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFTTEXT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1822 +1822 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                                 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1838 +1838 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                                 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1854 +1854 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1867 +1867 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -1880 +1880 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1894 +1894 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1937 +1937 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -1946 +1946 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 ////////
@@ -1963 +1963 @@
 
                 //ビットを考慮してCBS_DROPDOWNLISTを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWNLIST)==CBS_DROPDOWNLIST) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,2,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SIMPLE) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,0,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWN) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,1,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWNLIST)==CBS_DROPDOWNLIST) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,2,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SIMPLE) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,0,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWN) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,1,0);
 
 
@@ -1979 +1979 @@
                 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_OWNERDRAW_VARIABLE);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SORT) SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_NOINTEGRALHEIGHT) SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_UPPERCASE) SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_LOWERCASE) SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
-
-                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SORT) SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_NOINTEGRALHEIGHT) SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_UPPERCASE) SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_LOWERCASE) SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
+
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                 RadProperty_ComboBox_StylingOrder(hwnd,&tempStyle);
-                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
 
@@ -2005 +2005 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
                 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
 
@@ -2017 +2017 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_GETCURSEL,0,0);
                             //CBS_DROPDOWNLIST=CBS_SIMPLE | CBS_DROPDOWN
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DROPDOWNLIST );
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SIMPLE );
-                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWN );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWNLIST );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DROPDOWNLIST );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SIMPLE );
+                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWN );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWNLIST );
 
                             DrawRadWindow(i,pWindowInfo);
@@ -2033 +2033 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OWNERDRAWFIXED|CBS_OWNERDRAWVARIABLE );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWFIXED );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWVARIABLE );
-
-                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OWNERDRAWFIXED|CBS_OWNERDRAWVARIABLE );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWFIXED );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWVARIABLE );
+
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                             RadProperty_ComboBox_StylingOrder(hwnd,&tempStyle);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             return 1;
                         }
@@ -2050 +2050 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_HASSTRINGS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_HASSTRINGS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_HASSTRINGS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_HASSTRINGS );
                             return 1;
                         }
@@ -2062 +2062 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SORT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_SORT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SORT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_SORT );
                             return 1;
                         }
@@ -2074 +2074 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_NOINTEGRALHEIGHT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_NOINTEGRALHEIGHT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_NOINTEGRALHEIGHT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_NOINTEGRALHEIGHT );
                             return 1;
                         }
@@ -2086 +2086 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OEMCONVERT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OEMCONVERT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OEMCONVERT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OEMCONVERT );
                             return 1;
                         }
@@ -2098 +2098 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2111 +2111 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_AUTOHSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_AUTOHSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_AUTOHSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_AUTOHSCROLL );
                             return 1;
                         }
@@ -2123 +2123 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DISABLENOSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DISABLENOSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DISABLENOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DISABLENOSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2136 +2136 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_UPPERCASE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_UPPERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_UPPERCASE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_UPPERCASE );
                             return 1;
                         }
@@ -2148 +2148 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_LOWERCASE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_LOWERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_LOWERCASE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_LOWERCASE );
                             return 1;
                         }
@@ -2204 +2204 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -2214 +2214 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_MULTILINE) SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NUMBER) SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOVSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_PASSWORD) SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NOHIDESEL) SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_WANTRETURN) SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_UPPERCASE) SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_LOWERCASE) SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_READONLY) SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_MULTILINE) SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NUMBER) SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOVSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_PASSWORD) SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NOHIDESEL) SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_WANTRETURN) SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_UPPERCASE) SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_LOWERCASE) SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_READONLY) SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -2246 +2246 @@
 
                 //ビットを考慮してES_LEFTを最後に検討する
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_CENTER) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_RIGHT) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_CENTER) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_RIGHT) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,0,0);
 
-                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                 RadProperty_Edit_StylingOrder(hwnd,&tempStyle);
-                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
 
@@ -2262 +2262 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -2274 +2274 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_MULTILINE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_MULTILINE );
-
-                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_MULTILINE );
+
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                             RadProperty_Edit_StylingOrder(hwnd,&tempStyle);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2291 +2291 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NUMBER );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NUMBER );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NUMBER );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NUMBER );
                             return 1;
                         }
@@ -2303 +2303 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_HSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_HSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_HSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_HSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2316 +2316 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOHSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOHSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOHSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOHSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2329 +2329 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2342 +2342 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOVSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOVSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOVSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOVSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2355 +2355 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_PASSWORD );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_PASSWORD );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_PASSWORD );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_PASSWORD );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2368 +2368 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NOHIDESEL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NOHIDESEL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NOHIDESEL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NOHIDESEL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2381 +2381 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_OEMCONVERT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_OEMCONVERT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_OEMCONVERT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_OEMCONVERT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2394 +2394 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_WANTRETURN );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_WANTRETURN );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_WANTRETURN );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_WANTRETURN );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2407 +2407 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_UPPERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_UPPERCASE );
                                 SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2423 +2423 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_LOWERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_LOWERCASE );
                                 SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2439 +2439 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_READONLY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_READONLY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_READONLY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_READONLY );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2453 +2453 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_GETCURSEL,0,0);
                             //ES_LEFT=0
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_CENTER|ES_RIGHT );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_CENTER );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_RIGHT );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_CENTER|ES_RIGHT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_CENTER );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( ES_RIGHT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2489 +2489 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -2499 +2499 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -2519 +2519 @@
 
                 //ビットを考慮してBS_CENTERを最初に検討する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -2536 +2536 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -2548 +2548 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_GETCURSEL,0,0);
                             //BS_CENTER=BS_LEFT | BS_RIGHT
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_CENTER );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2564 +2564 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2577 +2577 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2590 +2590 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -2641 +2641 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -2650 +2650 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 //////////
@@ -2678 +2678 @@
                 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(long)STRING_IMAGEBOXPROP_STYLE_BITMAP);
 
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,0,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,1,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITEFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,2,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000001F)==SS_ETCHEDFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,3,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,4,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,5,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITERECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,6,0);
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON||
-                    (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
-                    if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,7,0);
-                    else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,8,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,0,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,1,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITEFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,2,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000001F)==SS_ETCHEDFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,3,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,4,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,5,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITERECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,6,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON||
+                    (pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
+                    if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,7,0);
+                    else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,8,0);
 
                     //リソース／ファイル スイッチチェックを表示
@@ -2697 +2697 @@
                     ShowWindow(GetDlgItem(hwnd,IDC_IMAGE_SITUATION),SW_SHOW);
 
-                    if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
+                    if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsFile()){
                         //ファイル指定を表示
                         ShowWindow(GetDlgItem(hwnd,IDC_PATH),SW_SHOW);
                         ShowWindow(GetDlgItem(hwnd,IDC_CHANGEPATH),SW_SHOW);
-                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
+                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path.c_str());
 
                         //イメージ状態テキスト
@@ -2709 +2709 @@
                         SendDlgItemMessage(hwnd,IDC_FILE,BM_SETCHECK,BST_CHECKED,0);
                     }
-                    else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsResource()){
+                    else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsResource()){
                         //リソース指定を表示
                         ShowWindow(GetDlgItem(hwnd,IDC_RESCOMBO),SW_SHOW);
@@ -2721 +2721 @@
                         SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_RESETCONTENT,0,0);
 
-                        if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
+                        if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
                             //アイコンリソースをコンボボックスに挿入
                             BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
@@ -2728 +2728 @@
                             }
                         }
-                        else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
+                        else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                             //ビットマップリソースをコンボボックスに挿入
                             BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
@@ -2737 +2737 @@
 
                         //リストから選択
-                        i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_FINDSTRING,0,(long)pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
+                        i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_FINDSTRING,0,(long)pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path.c_str());
                         SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
                     }
                 }
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_CENTERIMAGE) SendDlgItemMessage(hwnd,IDC_SS_CENTERIMAGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_RIGHTJUST) SendDlgItemMessage(hwnd,IDC_SS_RIGHTJUST,BM_SETCHECK,BST_CHECKED,0);
-
-                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_CENTERIMAGE) SendDlgItemMessage(hwnd,IDC_SS_CENTERIMAGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_RIGHTJUST) SendDlgItemMessage(hwnd,IDC_SS_RIGHTJUST,BM_SETCHECK,BST_CHECKED,0);
+
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                 RadProperty_ImageBox_StylingOrder(hwnd,&tempStyle);
-                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
                 bInitial=0;
@@ -2757 +2757 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -2769 +2769 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( 0x0000001F );
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BLACKFRAME );
-                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_GRAYFRAME );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_WHITEFRAME );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_ETCHEDFRAME );
-                            else if(i3==4) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BLACKRECT );
-                            else if(i3==5) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_GRAYRECT );
-                            else if(i3==6) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_WHITERECT );
-                            else if(i3==7) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_ICON );
-                            else if(i3==8) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BITMAP );
-
-                            if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON||
-                                (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( 0x0000001F );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BLACKFRAME );
+                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_GRAYFRAME );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_WHITEFRAME );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_ETCHEDFRAME );
+                            else if(i3==4) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BLACKRECT );
+                            else if(i3==5) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_GRAYRECT );
+                            else if(i3==6) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_WHITERECT );
+                            else if(i3==7) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_ICON );
+                            else if(i3==8) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BITMAP );
+
+                            if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON||
+                                (pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                                 //リソース／ファイル スイッチチェックを表示
                                 ShowWindow(GetDlgItem(hwnd,IDC_FILE),SW_SHOW);
@@ -2792 +2792 @@
                                 ShowWindow(GetDlgItem(hwnd,IDC_IMAGE_SITUATION),SW_SHOW);
 
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsFile()){
                                     //ファイル指定を表示
                                     ShowWindow(GetDlgItem(hwnd,IDC_PATH),SW_SHOW);
                                     ShowWindow(GetDlgItem(hwnd,IDC_CHANGEPATH),SW_SHOW);
-                                    SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
+                                    SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path.c_str());
 
                                     //イメージ状態テキスト
@@ -2804 +2804 @@
                                     SendDlgItemMessage(hwnd,IDC_FILE,BM_SETCHECK,BST_CHECKED,0);
                                 }
-                                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsResource()){
+                                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsResource()){
                                     //リソース指定を表示
                                     ShowWindow(GetDlgItem(hwnd,IDC_RESCOMBO),SW_SHOW);
@@ -2816 +2816 @@
                                     SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_RESETCONTENT,0,0);
 
-                                    if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
+                                    if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
                                         //アイコンリソースをコンボボックスに挿入
                                         for(i3=0;i3<static_cast<int>(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]]->image.path )
+                                            if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path )
                                             {
                                                 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
@@ -2827 +2827 @@
                                         }
                                     }
-                                    else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
+                                    else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                                         //ビットマップリソースをコンボボックスに挿入
                                         for(i3=0;i3<static_cast<int>(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]]->image.path )
+                                            if( projectInfo.resourceManager.bitmapResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path )
                                             {
                                                 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
@@ -2856 +2856 @@
                             }
 
-                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                             RadProperty_ImageBox_StylingOrder(hwnd,&tempStyle);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2865 +2865 @@
 
                     case IDC_FILE:
-                        if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
+                        if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsFile()){
                             //変更無し
                             break;
@@ -2871 +2871 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
-
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.type
+                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image);
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.type
                             = ActiveBasic::PM::ImageReferenceType::File;
 
@@ -2879 +2879 @@
                         ShowWindow(GetDlgItem(hwnd,IDC_PATH),SW_SHOW);
                         ShowWindow(GetDlgItem(hwnd,IDC_CHANGEPATH),SW_SHOW);
-                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
+                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path.c_str());
 
                         //リソース指定を非表示
@@ -2892 +2892 @@
 
                     case IDC_RESOURCE:
-                        if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsResource()){
+                        if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsResource()){
                             //変更無し
                             break;
@@ -2898 +2898 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
-
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.type
+                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image);
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.type
                             = ActiveBasic::PM::ImageReferenceType::Resource;
 
@@ -2918 +2918 @@
                         SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_RESETCONTENT,0,0);
 
-                        if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
+                        if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
                             //アイコンリソースをコンボボックスに挿入
                             BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
@@ -2925 +2925 @@
                             }
                         }
-                        else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
+                        else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                             //ビットマップリソースをコンボボックスに挿入
                             BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
@@ -2937 +2937 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
+                            Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image);
 
                             i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_GETCURSEL,0,0);
                             SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_GETLBTEXT,i3,(long)temporary);
 
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path = temporary;
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path = temporary;
 
                             DrawRadWindow(i,pWindowInfo);
@@ -2950 +2950 @@
                     case IDC_CHANGEPATH:
                         if(HIWORD(wParam)==BN_CLICKED){
-                            if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
-                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_ICON){
+                            if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsFile()){
+                                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_ICON){
                                     extern LPSTR IconFileFilter;
                                     //"アイコン ファイルを指定して下さい"
                                     if(!GetFilePathDialog(hwnd,temporary,IconFileFilter,STRING_IMAGEBOXPROP_GETPATH_ICON,1)) return 1;
                                 }
-                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_BITMAP){
+                                else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_BITMAP){
                                     extern LPSTR BitmapFileFilter;
                                     //"ビットマップ ファイルを指定して下さい"
@@ -2963 +2963 @@
 
                                 //変更情報
-                                Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
+                                Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image);
 
                                 lstrcpy( temporary, projectInfo.GetWorkDir().GetRelationalPath( temporary ).c_str() );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path = temporary;
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path = temporary;
 
                                 SetDlgItemText(hwnd,IDC_PATH,temporary);
@@ -2978 +2978 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOTIFY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOTIFY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOTIFY );
                             return 1;
                         }
@@ -2990 +2990 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_CENTERIMAGE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_CENTERIMAGE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_CENTERIMAGE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_CENTERIMAGE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_CENTERIMAGE );
                             return 1;
                         }
@@ -3002 +3002 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_RIGHTJUST,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_RIGHTJUST );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_RIGHTJUST );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_RIGHTJUST );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_RIGHTJUST );
                             return 1;
                         }
@@ -3035 +3035 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -3044 +3044 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 ////////
@@ -3063 +3063 @@
 
                 //ビットを考慮してLVS_LISTを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_LIST)==LVS_LIST) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,2,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SMALLICON) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_REPORT) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,3,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_LIST)==LVS_LIST) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,2,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SMALLICON) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_REPORT) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,3,0);
                 else SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,0,0);
 
@@ -3078 +3078 @@
                 SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_ADDSTRING,0,(long)STRING_LEFT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_SETCURSEL,1,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_SETCURSEL,1,0);
                 else SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_SETCURSEL,0,0);
 
@@ -3093 +3093 @@
                 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(long)STRING_SORT_DESCENDING);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SORTASCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SORTDESCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SORTASCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SORTDESCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SINGLESEL) SendDlgItemMessage(hwnd,IDC_LVS_SINGLESEL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_AUTOARRANGE) SendDlgItemMessage(hwnd,IDC_LVS_AUTOARRANGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOLABELWRAP) SendDlgItemMessage(hwnd,IDC_LVS_NOLABELWRAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_LVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_LVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOCOLUMNHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOCOLUMNHEADER,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOSORTHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOSORTHEADER,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_LVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LVS_OWNERDRAWFIXED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SHAREIMAGELISTS) SendDlgItemMessage(hwnd,IDC_LVS_SHAREIMAGELISTS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SINGLESEL) SendDlgItemMessage(hwnd,IDC_LVS_SINGLESEL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_AUTOARRANGE) SendDlgItemMessage(hwnd,IDC_LVS_AUTOARRANGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOLABELWRAP) SendDlgItemMessage(hwnd,IDC_LVS_NOLABELWRAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_LVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_LVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOCOLUMNHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOCOLUMNHEADER,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOSORTHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOSORTHEADER,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_LVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LVS_OWNERDRAWFIXED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SHAREIMAGELISTS) SendDlgItemMessage(hwnd,IDC_LVS_SHAREIMAGELISTS,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3116 +3116 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -3128 +3128 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SMALLICON|LVS_LIST|LVS_REPORT );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SMALLICON );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_LIST );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_REPORT );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SMALLICON|LVS_LIST|LVS_REPORT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SMALLICON );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_LIST );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_REPORT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3142 +3142 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_ALIGNLEFT );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_ALIGNLEFT );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_ALIGNLEFT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_ALIGNLEFT );
                             return 1;
                         }
@@ -3153 +3153 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SORTASCENDING|LVS_SORTDESCENDING );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SORTASCENDING );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SORTDESCENDING );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SORTASCENDING|LVS_SORTDESCENDING );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SORTASCENDING );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SORTDESCENDING );
                             return 1;
                         }
@@ -3166 +3166 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_SINGLESEL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SINGLESEL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SINGLESEL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SINGLESEL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SINGLESEL );
                             return 1;
                         }
@@ -3178 +3178 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_AUTOARRANGE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_AUTOARRANGE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_AUTOARRANGE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_AUTOARRANGE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_AUTOARRANGE );
                             return 1;
                         }
@@ -3190 +3190 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOLABELWRAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOLABELWRAP );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOLABELWRAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOLABELWRAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOLABELWRAP );
                             return 1;
                         }
@@ -3202 +3202 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_EDITLABELS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_EDITLABELS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_EDITLABELS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_EDITLABELS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_EDITLABELS );
                             return 1;
                         }
@@ -3214 +3214 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3227 +3227 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOCOLUMNHEADER,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOCOLUMNHEADER );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOCOLUMNHEADER );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOCOLUMNHEADER );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOCOLUMNHEADER );
                             return 1;
                         }
@@ -3239 +3239 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOSORTHEADER,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOSORTHEADER );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOSORTHEADER );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOSORTHEADER );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOSORTHEADER );
                             return 1;
                         }
@@ -3251 +3251 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_SHOWSELALWAYS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SHOWSELALWAYS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SHOWSELALWAYS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SHOWSELALWAYS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SHOWSELALWAYS );
                             return 1;
                         }
@@ -3263 +3263 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_OWNERDRAWFIXED,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_OWNERDRAWFIXED );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_OWNERDRAWFIXED );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_OWNERDRAWFIXED );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_OWNERDRAWFIXED );
                             return 1;
                         }
@@ -3275 +3275 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_SHAREIMAGELISTS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SHAREIMAGELISTS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SHAREIMAGELISTS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SHAREIMAGELISTS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SHAREIMAGELISTS );
                             return 1;
                         }
@@ -3326 +3326 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -3335 +3335 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 ////////
@@ -3353 +3353 @@
                 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(long)STRING_NONE_);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_MULTIPLESEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_EXTENDEDSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,2,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,3,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_MULTIPLESEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_EXTENDEDSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,2,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,3,0);
                 else SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,0,0);
 
@@ -3370 +3370 @@
                 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_OWNERDRAW_VARIABLE);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_LBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_SORT) SendDlgItemMessage(hwnd,IDC_LBS_SORT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOTIFY) SendDlgItemMessage(hwnd,IDC_LBS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_MULTICOLUMN) SendDlgItemMessage(hwnd,IDC_LBS_MULTICOLUMN,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_LBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOREDRAW) SendDlgItemMessage(hwnd,IDC_LBS_NOREDRAW,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_USETABSTOPS) SendDlgItemMessage(hwnd,IDC_LBS_USETABSTOPS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_WANTKEYBOARDINPUT) SendDlgItemMessage(hwnd,IDC_LBS_WANTKEYBOARDINPUT,BM_SETCHECK,BST_CHECKED,0);
-
-                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_LBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_SORT) SendDlgItemMessage(hwnd,IDC_LBS_SORT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOTIFY) SendDlgItemMessage(hwnd,IDC_LBS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_MULTICOLUMN) SendDlgItemMessage(hwnd,IDC_LBS_MULTICOLUMN,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_LBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOREDRAW) SendDlgItemMessage(hwnd,IDC_LBS_NOREDRAW,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_USETABSTOPS) SendDlgItemMessage(hwnd,IDC_LBS_USETABSTOPS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_WANTKEYBOARDINPUT) SendDlgItemMessage(hwnd,IDC_LBS_WANTKEYBOARDINPUT,BM_SETCHECK,BST_CHECKED,0);
+
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                 RadProperty_ListBox_StylingOrder(hwnd,&tempStyle);
-                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
 
@@ -3397 +3397 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -3409 +3409 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_MULTIPLESEL|LBS_EXTENDEDSEL|LBS_NOSEL );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_MULTIPLESEL );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_EXTENDEDSEL );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOSEL );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_MULTIPLESEL|LBS_EXTENDEDSEL|LBS_NOSEL );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_MULTIPLESEL );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_EXTENDEDSEL );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOSEL );
                             return 1;
                         }
@@ -3422 +3422 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_OWNERDRAWFIXED|LBS_OWNERDRAWVARIABLE );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_OWNERDRAWFIXED );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_OWNERDRAWVARIABLE );
-
-                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_OWNERDRAWFIXED|LBS_OWNERDRAWVARIABLE );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_OWNERDRAWFIXED );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_OWNERDRAWVARIABLE );
+
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle();
                             RadProperty_ListBox_StylingOrder(hwnd,&tempStyle);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             return 1;
                         }
@@ -3439 +3439 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_HASSTRINGS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_HASSTRINGS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_HASSTRINGS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_HASSTRINGS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_HASSTRINGS );
                             return 1;
                         }
@@ -3451 +3451 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_SORT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_SORT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_SORT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_SORT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_SORT );
                             return 1;
                         }
@@ -3463 +3463 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOTIFY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_NOTIFY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_NOTIFY );
                             return 1;
                         }
@@ -3475 +3475 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_MULTICOLUMN,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_MULTICOLUMN );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_MULTICOLUMN );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_MULTICOLUMN );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_MULTICOLUMN );
                             return 1;
                         }
@@ -3487 +3487 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_HSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_HSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_HSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_HSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3500 +3500 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3513 +3513 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_DISABLENOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_DISABLENOSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_DISABLENOSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_DISABLENOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_DISABLENOSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3526 +3526 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_NOREDRAW,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOREDRAW );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_NOREDRAW );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOREDRAW );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_NOREDRAW );
                             return 1;
                         }
@@ -3538 +3538 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_USETABSTOPS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_USETABSTOPS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_USETABSTOPS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_USETABSTOPS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_USETABSTOPS );
                             return 1;
                         }
@@ -3550 +3550 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_WANTKEYBOARDINPUT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_WANTKEYBOARDINPUT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_WANTKEYBOARDINPUT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_WANTKEYBOARDINPUT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_WANTKEYBOARDINPUT );
                             return 1;
                         }
@@ -3583 +3583 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -3592 +3592 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&PBS_VERTICAL) SendDlgItemMessage(hwnd,IDC_PBS_VERTICAL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&PBS_SMOOTH) SendDlgItemMessage(hwnd,IDC_PBS_SMOOTH,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&PBS_VERTICAL) SendDlgItemMessage(hwnd,IDC_PBS_VERTICAL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&PBS_SMOOTH) SendDlgItemMessage(hwnd,IDC_PBS_SMOOTH,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3608 +3608 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -3620 +3620 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_PBS_VERTICAL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( PBS_VERTICAL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( PBS_VERTICAL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( PBS_VERTICAL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( PBS_VERTICAL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3633 +3633 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_PBS_SMOOTH,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( PBS_SMOOTH );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( PBS_SMOOTH );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( PBS_SMOOTH );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( PBS_SMOOTH );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3667 +3667 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -3677 +3677 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTORADIOBUTTON)==BS_AUTORADIOBUTTON) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTORADIOBUTTON)==BS_AUTORADIOBUTTON) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3705 +3705 @@
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0);
 
@@ -3725 +3725 @@
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0);
 
@@ -3738 +3738 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -3750 +3750 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTORADIOBUTTON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTORADIOBUTTON );
                             }
                             else{
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RADIOBUTTON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RADIOBUTTON );
                             }
                             return 1;
@@ -3766 +3766 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_PUSHLIKE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_PUSHLIKE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_PUSHLIKE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_PUSHLIKE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3779 +3779 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFTTEXT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFTTEXT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFTTEXT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFTTEXT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3792 +3792 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                                 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3808 +3808 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                                 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3824 +3824 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3837 +3837 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -3850 +3850 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3864 +3864 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3900 +3900 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -3909 +3909 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3926 +3926 @@
                 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,(long)STRING_SCROLLBARPROP_STYLE_BOTTOMORRIGHT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SBS_TOPALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SBS_BOTTOMALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SBS_TOPALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SBS_BOTTOMALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,0,0);
 
@@ -3938 +3938 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -3950 +3950 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SBS_TOPALIGN|SBS_BOTTOMALIGN );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SBS_TOPALIGN );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SBS_BOTTOMALIGN );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SBS_TOPALIGN|SBS_BOTTOMALIGN );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SBS_TOPALIGN );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SBS_BOTTOMALIGN );
                             return 1;
                         }
@@ -3984 +3984 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -3994 +3994 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOPREFIX) SendDlgItemMessage(hwnd,IDC_SS_NOPREFIX,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_LEFTNOWORDWRAP) SendDlgItemMessage(hwnd,IDC_SS_LEFTNOWORDWRAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOPREFIX) SendDlgItemMessage(hwnd,IDC_SS_NOPREFIX,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_LEFTNOWORDWRAP) SendDlgItemMessage(hwnd,IDC_SS_LEFTNOWORDWRAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4016 +4016 @@
 
                 //ビットを考慮してSS_LEFTを最後に検討する
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_CENTER) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_RIGHT) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_CENTER) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_RIGHT) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,0,0);
 
@@ -4028 +4028 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -4040 +4040 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_NOPREFIX,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOPREFIX );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOPREFIX );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOPREFIX );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOPREFIX );
                             return 1;
                         }
@@ -4052 +4052 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_LEFTNOWORDWRAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_LEFTNOWORDWRAP );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_LEFTNOWORDWRAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_LEFTNOWORDWRAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_LEFTNOWORDWRAP );
 
                             DrawRadWindow(i,pWindowInfo);
@@ -4066 +4066 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOTIFY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOTIFY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOTIFY );
                             return 1;
                         }
@@ -4079 +4079 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_GETCURSEL,0,0);
                             //SS_LEFT=0
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_CENTER|SS_RIGHT );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_CENTER );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_RIGHT );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_CENTER|SS_RIGHT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_CENTER );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( SS_RIGHT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4114 +4114 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -4123 +4123 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4138 +4138 @@
                 SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_ADDSTRING,0,(long)STRING_DIRECTION_VERTICAL);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_VERT) SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_SETCURSEL,1,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_VERT) SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_SETCURSEL,1,0);
                 else SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_SETCURSEL,0,0);
 
@@ -4153 +4153 @@
                 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,(long)STRING_TRACKBARPROP_STYLE_POSITION_BOTTOMORRIGHT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_BOTH) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,0,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_TOP) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,1,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_BOTH) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,0,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_TOP) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,1,0);
                 else SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,2,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_NOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_NOTICKS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_AUTOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_AUTOTICKS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_ENABLESELRANGE) SendDlgItemMessage(hwnd,IDC_TBS_ENABLESELRANGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_NOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_NOTICKS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_AUTOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_AUTOTICKS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_ENABLESELRANGE) SendDlgItemMessage(hwnd,IDC_TBS_ENABLESELRANGE,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4169 +4169 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -4181 +4181 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_VERT );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_VERT );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_VERT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_VERT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4193 +4193 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_BOTH|TBS_TOP );
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_BOTH );
-                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_TOP );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_BOTH|TBS_TOP );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_BOTH );
+                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_TOP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4207 +4207 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TBS_NOTICKS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_NOTICKS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_NOTICKS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_NOTICKS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_NOTICKS );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4220 +4220 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TBS_AUTOTICKS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_AUTOTICKS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_AUTOTICKS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_AUTOTICKS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_AUTOTICKS );
                             return 1;
                         }
@@ -4232 +4232 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TBS_ENABLESELRANGE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_ENABLESELRANGE );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_ENABLESELRANGE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_ENABLESELRANGE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_ENABLESELRANGE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4266 +4266 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -4274 +4274 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_HASBUTTONS) SendDlgItemMessage(hwnd,IDC_TVS_HASBUTTONS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_HASLINES) SendDlgItemMessage(hwnd,IDC_TVS_HASLINES,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_LINESATROOT) SendDlgItemMessage(hwnd,IDC_TVS_LINESATROOT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_TVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_DISABLEDRAGDROP) SendDlgItemMessage(hwnd,IDC_TVS_DISABLEDRAGDROP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_TVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_TVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_NOTOOLTIPS) SendDlgItemMessage(hwnd,IDC_TVS_NOTOOLTIPS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_CHECKBOXES) SendDlgItemMessage(hwnd,IDC_TVS_CHECKBOXES,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_FULLROWSELECT) SendDlgItemMessage(hwnd,IDC_TVS_FULLROWSELECT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_TRACKSELECT) SendDlgItemMessage(hwnd,IDC_TVS_TRACKSELECT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_SINGLEEXPAND) SendDlgItemMessage(hwnd,IDC_TVS_SINGLEEXPAND,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_HASBUTTONS) SendDlgItemMessage(hwnd,IDC_TVS_HASBUTTONS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_HASLINES) SendDlgItemMessage(hwnd,IDC_TVS_HASLINES,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_LINESATROOT) SendDlgItemMessage(hwnd,IDC_TVS_LINESATROOT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_TVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_DISABLEDRAGDROP) SendDlgItemMessage(hwnd,IDC_TVS_DISABLEDRAGDROP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_TVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_TVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_NOTOOLTIPS) SendDlgItemMessage(hwnd,IDC_TVS_NOTOOLTIPS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_CHECKBOXES) SendDlgItemMessage(hwnd,IDC_TVS_CHECKBOXES,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_FULLROWSELECT) SendDlgItemMessage(hwnd,IDC_TVS_FULLROWSELECT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_TRACKSELECT) SendDlgItemMessage(hwnd,IDC_TVS_TRACKSELECT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_SINGLEEXPAND) SendDlgItemMessage(hwnd,IDC_TVS_SINGLEEXPAND,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4300 +4300 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -4312 +4312 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_HASBUTTONS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_HASBUTTONS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_HASBUTTONS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_HASBUTTONS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_HASBUTTONS );
                             return 1;
                         }
@@ -4324 +4324 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_HASLINES,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_HASLINES );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_HASLINES );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_HASLINES );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_HASLINES );
                             return 1;
                         }
@@ -4336 +4336 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_LINESATROOT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_LINESATROOT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_LINESATROOT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_LINESATROOT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_LINESATROOT );
                             return 1;
                         }
@@ -4348 +4348 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_EDITLABELS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_EDITLABELS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_EDITLABELS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_EDITLABELS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_EDITLABELS );
                             return 1;
                         }
@@ -4360 +4360 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_DISABLEDRAGDROP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_DISABLEDRAGDROP );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_DISABLEDRAGDROP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_DISABLEDRAGDROP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_DISABLEDRAGDROP );
                             return 1;
                         }
@@ -4372 +4372 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_SHOWSELALWAYS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_SHOWSELALWAYS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_SHOWSELALWAYS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_SHOWSELALWAYS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_SHOWSELALWAYS );
                             return 1;
                         }
@@ -4384 +4384 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_NOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_NOSCROLL );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_NOSCROLL );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_NOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_NOSCROLL );
                             return 1;
                         }
@@ -4396 +4396 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_NOTOOLTIPS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_NOTOOLTIPS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_NOTOOLTIPS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_NOTOOLTIPS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_NOTOOLTIPS );
                             return 1;
                         }
@@ -4408 +4408 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_CHECKBOXES,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_CHECKBOXES );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_CHECKBOXES );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_CHECKBOXES );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_CHECKBOXES );
                             return 1;
                         }
@@ -4420 +4420 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_FULLROWSELECT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_FULLROWSELECT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_FULLROWSELECT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_FULLROWSELECT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_FULLROWSELECT );
                             return 1;
                         }
@@ -4432 +4432 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_TRACKSELECT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_TRACKSELECT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_TRACKSELECT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_TRACKSELECT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_TRACKSELECT );
                             return 1;
                         }
@@ -4444 +4444 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_SINGLEEXPAND,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_SINGLEEXPAND );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_SINGLEEXPAND );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_SINGLEEXPAND );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_SINGLEEXPAND );
                             return 1;
                         }
@@ -4477 +4477 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -4487 +4487 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4502 +4502 @@
                 SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_ADDSTRING,0,(long)STRING_DIRECTION_VERTICAL);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_HORZ) SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_SETCURSEL,0,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_HORZ) SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_SETCURSEL,0,0);
                 else SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_SETCURSEL,1,0);
 
@@ -4516 +4516 @@
                 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(long)STRING_RIGHT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ALIGNRIGHT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ALIGNRIGHT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_AUTOBUDDY) SendDlgItemMessage(hwnd,IDC_UDS_AUTOBUDDY,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_SETBUDDYINT) SendDlgItemMessage(hwnd,IDC_UDS_SETBUDDYINT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_NOTHOUSANDS) SendDlgItemMessage(hwnd,IDC_UDS_NOTHOUSANDS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_WRAP) SendDlgItemMessage(hwnd,IDC_UDS_WRAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ARROWKEYS) SendDlgItemMessage(hwnd,IDC_UDS_ARROWKEYS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_AUTOBUDDY) SendDlgItemMessage(hwnd,IDC_UDS_AUTOBUDDY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_SETBUDDYINT) SendDlgItemMessage(hwnd,IDC_UDS_SETBUDDYINT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_NOTHOUSANDS) SendDlgItemMessage(hwnd,IDC_UDS_NOTHOUSANDS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_WRAP) SendDlgItemMessage(hwnd,IDC_UDS_WRAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ARROWKEYS) SendDlgItemMessage(hwnd,IDC_UDS_ARROWKEYS,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4534 +4534 @@
                 i=GetWndNum(GetParent(GetParent(hwnd)));
                 if(i==-1) return 1;
-                i2=GetWndInfoNum(MdiInfo[i].path);
-                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                i2=GetWndInfoNum(MdiInfo[i]->path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path);
 
                 //共通スタイル
@@ -4546 +4546 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_HORZ );
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_HORZ );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_HORZ );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_HORZ );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4558 +4558 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_ALIGNLEFT|UDS_ALIGNRIGHT );
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ALIGNLEFT );
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ALIGNRIGHT );
+                            pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_ALIGNLEFT|UDS_ALIGNRIGHT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ALIGNLEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ALIGNRIGHT );
                             return 1;
                         }
@@ -4571 +4571 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_AUTOBUDDY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_AUTOBUDDY );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_AUTOBUDDY );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_AUTOBUDDY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_AUTOBUDDY );
                             return 1;
                         }
@@ -4583 +4583 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_SETBUDDYINT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_SETBUDDYINT );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_SETBUDDYINT );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_SETBUDDYINT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_SETBUDDYINT );
                             return 1;
                         }
@@ -4595 +4595 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_NOTHOUSANDS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_NOTHOUSANDS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_NOTHOUSANDS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_NOTHOUSANDS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_NOTHOUSANDS );
                             return 1;
                         }
@@ -4607 +4607 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_WRAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_WRAP );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_WRAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_WRAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_WRAP );
                             return 1;
                         }
@@ -4619 +4619 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i]->MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_ARROWKEYS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ARROWKEYS );
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_ARROWKEYS );
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ARROWKEYS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_ARROWKEYS );
                             return 1;
                         }
@@ -4674 +4674 @@
             ScrollInfo.fMask=SIF_PAGE|SIF_RANGE|SIF_POS;
             GetScrollInfo(hwnd,SB_VERT,&ScrollInfo);
-            GetClientRect(MdiInfo[i].MdiRadInfo->hProp_Dlg,&rect);
+            GetClientRect(MdiInfo[i]->MdiRadInfo->hProp_Dlg,&rect);
             ScrollInfo.nMin=0;
             ScrollInfo.nMax=rect.bottom;

trunk/ab5.0/abdev/abdev/Rad_UndoRedo.cpp

@@ -9 +9 @@
     RAD_UNDOSTATE *pUndoState;
 
-    pUndoState=&MdiInfo[WndNum].MdiRadInfo->undo;
+    pUndoState=&MdiInfo[WndNum]->MdiRadInfo->undo;
     i=pUndoState->NowPos-1;
     if(i==-1) i=MAX_UNDONUM-1;
@@ -18 +18 @@
     pUndoState->NowPos=i;
 
-    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
-    int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
+    int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum]->path);
     switch(pUndoState->Command[pUndoState->NowPos]){
         case RAD_UNDO_INSERTITEM:
             DeleteDlgItem(WndNum,WndInfoNum,pUndoState->SelectItemNum[pUndoState->NowPos],0);
-            MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]=-1;
+            MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]=-1;
             break;
         case RAD_UNDO_DELETEITEM:
@@ -45 +45 @@
                 names->name = tempStr;
 
-                MdiInfo[WndNum].path = pWindowInfo->GetName();
+                MdiInfo[WndNum]->path = pWindowInfo->GetName();
             }
             else{
@@ -53 +53 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             break;
@@ -69 +69 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             DrawRadWindow(WndNum,pWindowInfo);
@@ -79 +79 @@
             pWindowInfo->LogFont=*pLogFont;
             *pLogFont=lf;
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             DrawRadWindow(WndNum,pWindowInfo);
@@ -89 +89 @@
                 pUndoState->lpdwData[pUndoState->NowPos] = static_cast<DWORD>(tempBgColor);
 
-                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                     ChangePropertyWindow(WndNum,WndInfoNum);
                 DrawRadWindow(WndNum,pWindowInfo);
@@ -100 +100 @@
                 delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
                 pUndoState->lpdwData[pUndoState->NowPos] = (DWORD)( new std::string( tempMenuIdName ) );
-                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 {
                     ChangePropertyWindow(WndNum,WndInfoNum);
@@ -114 +114 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             break;
@@ -128 +128 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=dw;
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             DrawRadWindow(WndNum,pWindowInfo);
@@ -177 +177 @@
                 pImageCtrlInfo->path = tempPath;
 
-                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                     ChangePropertyWindow(WndNum,WndInfoNum);
                 DrawRadWindow(WndNum,pWindowInfo);
@@ -187 +187 @@
             pUndoState->lpdwData[pUndoState->NowPos]=dw;
 
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             break;
@@ -203 +203 @@
     RECT rect;
 
-    pUndoState=&MdiInfo[WndNum].MdiRadInfo->undo;
+    pUndoState=&MdiInfo[WndNum]->MdiRadInfo->undo;
     if(!pUndoState->Command[pUndoState->NowPos]){
         MessageBeep(0);
@@ -209 +209 @@
     }
 
-    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
-    int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
+    int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum]->path);
     switch(pUndoState->Command[pUndoState->NowPos]){
         case RAD_UNDO_INSERTITEM:
@@ -224 +224 @@
         case RAD_UNDO_DELETEITEM:
             DeleteDlgItem(WndNum,WndInfoNum,pUndoState->SelectItemNum[pUndoState->NowPos],0);
-            MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]=-1;
+            MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]=-1;
             break;
         case RAD_UNDO_NAME:
@@ -234 +234 @@
                 names->name = tempStr;
 
-                MdiInfo[WndNum].path = pWindowInfo->GetName();
+                MdiInfo[WndNum]->path = pWindowInfo->GetName();
             }
             else{
@@ -242 +242 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             break;
@@ -258 +258 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             DrawRadWindow(WndNum,pWindowInfo);
@@ -268 +268 @@
             pWindowInfo->LogFont=*pLogFont;
             *pLogFont=lf;
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             DrawRadWindow(WndNum,pWindowInfo);
@@ -278 +278 @@
                 pUndoState->lpdwData[pUndoState->NowPos] = static_cast<DWORD>(tempBgColor);
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             DrawRadWindow(WndNum,pWindowInfo);
@@ -288 +288 @@
                 delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
                 pUndoState->lpdwData[pUndoState->NowPos] = (DWORD)( new std::string( tempMenuIdName ) );
-                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 {
                     ChangePropertyWindow(WndNum,WndInfoNum);
@@ -302 +302 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             break;
@@ -316 +316 @@
                 pUndoState->lpdwData[pUndoState->NowPos]=dw;
             }
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             DrawRadWindow(WndNum,pWindowInfo);
@@ -365 +365 @@
                 pImageCtrlInfo->path = tempPath;
 
-                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                     ChangePropertyWindow(WndNum,WndInfoNum);
                 DrawRadWindow(WndNum,pWindowInfo);
@@ -375 +375 @@
             pUndoState->lpdwData[pUndoState->NowPos]=dw;
 
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
             break;
@@ -391 +391 @@
     RAD_UNDOSTATE *pUndoState;
 
-    pUndoState=&MdiInfo[WndNum].MdiRadInfo->undo;
+    pUndoState=&MdiInfo[WndNum]->MdiRadInfo->undo;
     switch(pUndoState->Command[pos]){
         case RAD_UNDO_INSERTITEM:
@@ -450 +450 @@
     RAD_UNDOSTATE *pUndoState;
 
-    pUndoState=&MdiInfo[WndNum].MdiRadInfo->undo;
+    pUndoState=&MdiInfo[WndNum]->MdiRadInfo->undo;
 
     //Redoされた場合の不要なデータを削除する

trunk/ab5.0/abdev/abdev/Replace.cpp

@@ -9 +9 @@
     CHARRANGE Range,cr2;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     //行の先頭位置を取得
@@ -31 +31 @@
     //初期化（すべて黒色に戻す）
     for(i=Range.cpMin;i<Range.cpMax;i++){
-        MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
+        MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
     }
 
@@ -60 +60 @@
             if(bResult){
                 for(i2=cr2.cpMin;i2<cr2.cpMax;i2++){
-                    MdiInfo[WndNum].pMdiTextEdit->pColorRef[i2]=tci.rgbStatement;
+                    MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i2]=tci.rgbStatement;
                 }
             }
@@ -66 +66 @@
         if(IsStr||pBuf[i]=='\"'&&IsStr==0){
             //文字列カラー（""で囲まれる範囲）
-            MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbString;
+            MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbString;
         }
         if(pBuf[i]=='\0') break;
@@ -90 +90 @@
     //バッファ長を取得
     int length;
-    length=lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer);
+    length=lstrlen(MdiInfo[WndNum]->pMdiTextEdit->buffer);
 
     int delta;
@@ -99 +99 @@
         ////////////////////
 
-        MdiInfo[WndNum].pMdiTextEdit->buffer=(char *)HeapReAlloc(hHeap,
+        MdiInfo[WndNum]->pMdiTextEdit->buffer=(char *)HeapReAlloc(hHeap,
             0,
-            MdiInfo[WndNum].pMdiTextEdit->buffer,
+            MdiInfo[WndNum]->pMdiTextEdit->buffer,
             length+1+delta);
 
-        MdiInfo[WndNum].pMdiTextEdit->pColorRef=(COLORREF *)HeapReAlloc(hHeap,
+        MdiInfo[WndNum]->pMdiTextEdit->pColorRef=(COLORREF *)HeapReAlloc(hHeap,
             0,
-            MdiInfo[WndNum].pMdiTextEdit->pColorRef,
+            MdiInfo[WndNum]->pMdiTextEdit->pColorRef,
             (length+1+delta)*sizeof(COLORREF));
     }
@@ -114 +114 @@
     if( projectInfo.IsOpened() ){
         projectInfo.pobj_DBBreakPoint->replace(
-            MdiInfo[WndNum].path.c_str(),
-            MdiInfo[WndNum].pMdiTextEdit->buffer,
+            MdiInfo[WndNum]->path.c_str(),
+            MdiInfo[WndNum]->pMdiTextEdit->buffer,
             &DelRange,
             &Range,
@@ -123 +123 @@
         extern CDBBreakPoint *pobj_DBBreakPoint;
         pobj_DBBreakPoint->replace(
-            MdiInfo[WndNum].path.c_str(),
-            MdiInfo[WndNum].pMdiTextEdit->buffer,
+            MdiInfo[WndNum]->path.c_str(),
+            MdiInfo[WndNum]->pMdiTextEdit->buffer,
             &DelRange,
             &Range,
@@ -132 +132 @@
 
     //文字列バッファをスライドして、挿入
-    SlideString(MdiInfo[WndNum].pMdiTextEdit->buffer+DelRange.cpMax,
+    SlideString(MdiInfo[WndNum]->pMdiTextEdit->buffer+DelRange.cpMax,
         delta);
-    memcpy(MdiInfo[WndNum].pMdiTextEdit->buffer+Range.cpMin,str,lstrlen(str));
+    memcpy(MdiInfo[WndNum]->pMdiTextEdit->buffer+Range.cpMin,str,lstrlen(str));
 
     //文字カラーバッファをスライド
-    SlideBuffer(((char *)MdiInfo[WndNum].pMdiTextEdit->pColorRef)+DelRange.cpMax*sizeof(COLORREF),
+    SlideBuffer(((char *)MdiInfo[WndNum]->pMdiTextEdit->pColorRef)+DelRange.cpMax*sizeof(COLORREF),
         (length-DelRange.cpMax) * sizeof(COLORREF),
         delta*sizeof(COLORREF));
     //色づけ
-    TextEdit_ResetWordColor(WndNum,&Range,MdiInfo[WndNum].DocType);
+    TextEdit_ResetWordColor(WndNum,&Range,MdiInfo[WndNum]->DocType);
 
     //新しいキャレット位置に変更
-    GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+    GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
         Range.cpMax,
-        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
-    MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
+    MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
 
     //コントロールタブスペースの幅と行番号の文字数を更新
-    MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace=
-        GetControlTabSpace(WndNum,&MdiInfo[WndNum].pMdiTextEdit->iLineNumberTextCount);
+    MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace=
+        GetControlTabSpace(WndNum,&MdiInfo[WndNum]->pMdiTextEdit->iLineNumberTextCount);
 
     if(bRedraw){
@@ -159 +159 @@
 
         if(!TextEdit_ScrollCaret(WndNum,0)){
-            UpdateWindow(MdiInfo[WndNum].pMdiTextEdit->hEdit);  //ちらつき防止
-            InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->hEdit,NULL,0);
+            UpdateWindow(MdiInfo[WndNum]->pMdiTextEdit->hEdit); //ちらつき防止
+            InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->hEdit,NULL,0);
         }
 
@@ -167 +167 @@
 
     //上下キャレット移動時の左右位置保持機能を解除
-    MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+    MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
 
     //編集メニューをリセット
     ResetState_EditMenu();
 
-    if( ! MdiInfo[WndNum].pMdiTextEdit->IsModified() ){
+    if( ! MdiInfo[WndNum]->pMdiTextEdit->IsModified() ){
         //変更フラグをセット
-        MdiInfo[WndNum].pMdiTextEdit->Modify();
+        MdiInfo[WndNum]->pMdiTextEdit->Modify();
     }
 
@@ -180 +180 @@
     //if( projectInfo.IsOpened() ){
         //プロジェクトが開かれているとき
-        if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC){
+        if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC){
             //クラスツリーを再表示
             ResetClassTree(GetFileNum(WndNum));
@@ -193 +193 @@
     CHARRANGE Range,DelRange;
 
-    if(MdiInfo[WndNum].IndentStr){
+    if(MdiInfo[WndNum]->IndentStr){
         //自動インデントを有効にする
-        lstrcpy(temporary,MdiInfo[WndNum].IndentStr);
+        lstrcpy(temporary,MdiInfo[WndNum]->IndentStr);
 
         CancelBeforeAutoIndent(WndNum);
@@ -246 +246 @@
 #endif
         char *pBuf;
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
         //行全体を選択(min)
@@ -271 +271 @@
     buffer=(char *)HeapAlloc(hHeap,0,length*3+1024);
     temporary=(char *)HeapAlloc(hHeap,0,length*3+1024);
-    memcpy(buffer,MdiInfo[WndNum].pMdiTextEdit->buffer+CharRange.cpMin,length);
+    memcpy(buffer,MdiInfo[WndNum]->pMdiTextEdit->buffer+CharRange.cpMin,length);
     buffer[length]=0;
 

trunk/ab5.0/abdev/abdev/Resource.cpp

@@ -162 +162 @@
     // ウィンドウ プロパティを更新
     for(i2=0;i2<MdiInfo.size();i2++){
-        if(MdiInfo[i2].hwnd&&MdiInfo[i2].DocType==WNDTYPE_RAD){
-            if(MdiInfo[i2].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                ChangePropertyWindow(i2,GetWndInfoNum(MdiInfo[i2].path));
+        if(MdiInfo[i2]->hwnd&&MdiInfo[i2]->DocType==WNDTYPE_RAD){
+            if(MdiInfo[i2]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                ChangePropertyWindow(i2,GetWndInfoNum(MdiInfo[i2]->path));
         }
     }
@@ -269 +269 @@
     // ウィンドウ プロパティを更新
     for(i2=0;i2<MdiInfo.size();i2++){
-        if(MdiInfo[i2].hwnd&&MdiInfo[i2].DocType==WNDTYPE_RAD){
-            if(MdiInfo[i2].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                ChangePropertyWindow(i2,GetWndInfoNum(MdiInfo[i2].path));
+        if(MdiInfo[i2]->hwnd&&MdiInfo[i2]->DocType==WNDTYPE_RAD){
+            if(MdiInfo[i2]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                ChangePropertyWindow(i2,GetWndInfoNum(MdiInfo[i2]->path));
         }
     }
@@ -303 +303 @@
     // ウィンドウ プロパティを更新
     for(i2=0;i2<MdiInfo.size();i2++){
-        if(MdiInfo[i2].hwnd&&MdiInfo[i2].DocType==WNDTYPE_RAD){
-            if(MdiInfo[i2].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                ChangePropertyWindow(i2,GetWndInfoNum(MdiInfo[i2].path));
+        if(MdiInfo[i2]->hwnd&&MdiInfo[i2]->DocType==WNDTYPE_RAD){
+            if(MdiInfo[i2]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
+                ChangePropertyWindow(i2,GetWndInfoNum(MdiInfo[i2]->path));
         }
     }

trunk/ab5.0/abdev/abdev/Ruler.cpp

@@ -59 +59 @@
 
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[m_WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[m_WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     HBRUSH hBrush,hOldBrush;

trunk/ab5.0/abdev/abdev/Search.cpp

@@ -36 +36 @@
     hEdit=GetWindow(GetWindow(hClient,GW_CHILD),GW_CHILD);
 
-    i=lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer)+1;
+    i=lstrlen(MdiInfo[WndNum]->pMdiTextEdit->buffer)+1;
 
     buffer=(char *)HeapAlloc(hHeap,0,i);
-    lstrcpy(buffer,MdiInfo[WndNum].pMdiTextEdit->buffer);
+    lstrcpy(buffer,MdiInfo[WndNum]->pMdiTextEdit->buffer);
 
     LineStr=(char *)HeapAlloc(hHeap,0,i+64);
@@ -106 +106 @@
 
                     char *pBuf;
-                    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+                    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
                     //行の末端位置を取得
@@ -145 +145 @@
     if(WndNum==-1) return 0;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     TextEdit_GetSel(WndNum,&CharRange);
@@ -244 +244 @@
             pTemp=(char *)HeapAlloc(hHeap,0,CharRange.cpMax-CharRange.cpMin+1);
             memcpy(pTemp,
-                MdiInfo[WndNum].pMdiTextEdit->buffer+CharRange.cpMin,
+                MdiInfo[WndNum]->pMdiTextEdit->buffer+CharRange.cpMin,
                 CharRange.cpMax-CharRange.cpMin);
             pTemp[CharRange.cpMax-CharRange.cpMin]=0;
@@ -344 +344 @@
             pTemp=(char *)HeapAlloc(hHeap,0,CharRange.cpMax-CharRange.cpMin+1);
             memcpy(pTemp,
-                MdiInfo[WndNum].pMdiTextEdit->buffer+CharRange.cpMin,
+                MdiInfo[WndNum]->pMdiTextEdit->buffer+CharRange.cpMin,
                 CharRange.cpMax-CharRange.cpMin);
             pTemp[CharRange.cpMax-CharRange.cpMin]=0;
@@ -417 +417 @@
                     pTemp=(char *)HeapAlloc(hHeap,0,CharRange.cpMax-CharRange.cpMin+1);
                     memcpy(pTemp,
-                        MdiInfo[WndNum].pMdiTextEdit->buffer+CharRange.cpMin,
+                        MdiInfo[WndNum]->pMdiTextEdit->buffer+CharRange.cpMin,
                         CharRange.cpMax-CharRange.cpMin);
                     pTemp[CharRange.cpMax-CharRange.cpMin]=0;
@@ -495 +495 @@
                             pTemp=(char *)HeapAlloc(hHeap,0,CharRange.cpMax-CharRange.cpMin+1);
                             memcpy(pTemp,
-                                MdiInfo[WndNum].pMdiTextEdit->buffer+CharRange.cpMin,
+                                MdiInfo[WndNum]->pMdiTextEdit->buffer+CharRange.cpMin,
                                 CharRange.cpMax-CharRange.cpMin);
                             pTemp[CharRange.cpMax-CharRange.cpMin]=0;

trunk/ab5.0/abdev/abdev/StringCount.cpp

@@ -25 +25 @@
         else{
             //すべての範囲
-            pBuf=(char *)HeapAlloc(hHeap,0,lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer)+1);
-            lstrcpy(pBuf,MdiInfo[WndNum].pMdiTextEdit->buffer);
+            pBuf=(char *)HeapAlloc(hHeap,0,lstrlen(MdiInfo[WndNum]->pMdiTextEdit->buffer)+1);
+            lstrcpy(pBuf,MdiInfo[WndNum]->pMdiTextEdit->buffer);
         }
 
@@ -100 +100 @@
 
 
+

trunk/ab5.0/abdev/abdev/SubOperation.cpp

@@ -893 +893 @@
         int i;
         for(i=0;i<MdiInfo.size();i++){
-            if(MdiInfo[i].hwnd){
-                if(IS_DOCUMENT_TEXT(MdiInfo[i].DocType)){
+            if(MdiInfo[i]->hwnd){
+                if(IS_DOCUMENT_TEXT(MdiInfo[i]->DocType)){
                     SetTextEditWordColor(i);
-                    InvalidateRect(MdiInfo[i].pMdiTextEdit->hEdit,NULL,0);
+                    InvalidateRect(MdiInfo[i]->pMdiTextEdit->hEdit,NULL,0);
                 }
             }
@@ -1392 +1392 @@
 
 //各ウィンドウ生成
-void SetupWindow(HWND hwnd){
+void SetupWindow(HWND hwnd)
+{
     extern HINSTANCE hInst;
     extern HMENU hFirstMainMenu;
-    RECT rect;
-    CLIENTCREATESTRUCT ccs;
 
     INITCOMMONCONTROLSEX InitCommCtrl;
@@ -1405 +1404 @@
     //タブウィンドウ
     pobj_MainTab=new CMainTab(hwnd);
-
-    //MDIの親ウィンドウ（クライアントウィンドウ）を作成
-    ccs.hWindowMenu=hFirstMainMenu;
-    ccs.idFirstChild=ID_FIRSTCHILD;
-    GetClientRect(hwnd,&rect);
-    hClient=CreateWindowEx(WS_EX_CLIENTEDGE,"MDICLIENT",NULL,
-        WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS|WS_VISIBLE,
-        0,0,0,0,
-        hwnd,(HMENU)1,hInst,(LPSTR)&ccs);
 
     //レバーオブジェクトを生成
@@ -1471 +1461 @@
 
     WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-        if(MdiInfo[WndNum].path.empty()){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
+        if(MdiInfo[WndNum]->path.empty()){
             //"保存先のファイルを指定してください"
             if(!GetFilePathDialog(hOwner,temp2,DefFileFilter,STRING_FILESAVETITLE_DEFAULT,0)) return FALSE;
@@ -1479 +1469 @@
         }
         else{
-            if( MdiInfo[WndNum].pMdiTextEdit->IsModified() ){
+            if( MdiInfo[WndNum]->pMdiTextEdit->IsModified() ){
                 if(!SaveDocument(hChild,NULL)) return 0;
             }
             else{
-                if(hFind=FindFirstFile(MdiInfo[WndNum].path.c_str(),&wfd)){
+                if(hFind=FindFirstFile(MdiInfo[WndNum]->path.c_str(),&wfd)){
                     if(hFind==INVALID_HANDLE_VALUE){
                         if(!SaveDocument(hChild,NULL)) return 0;

trunk/ab5.0/abdev/abdev/TabCtrl.cpp

@@ -178 +178 @@
 
     if(isResize){
-        if(sw) ResizeOwnerWnd();
+        if(sw) ActiveBasic::IDE::Program::mainFrame.Resized();
     }
 }
@@ -190 +190 @@
 
     if(isResize){
-        if(TabCtrl_GetItemCount(hTab)==0) ResizeOwnerWnd();
+        if(TabCtrl_GetItemCount(hTab)==0) ActiveBasic::IDE::Program::mainFrame.Resized();
     }
 }
@@ -262 +262 @@
 
     for(i=0;i<MdiInfo.size();i++){
-        if(lstrcmpi(ItemText,MdiInfo[i].title.c_str())==0) break;
-    }
-    BringWindowToTop(MdiInfo[i].hwnd);
+        if(lstrcmpi(ItemText,MdiInfo[i]->title.c_str())==0) break;
+    }
+    BringWindowToTop(MdiInfo[i]->hwnd);
 }
 void CMainTab::MdiActiveEvent(const char *lpszText){

trunk/ab5.0/abdev/abdev/TextEditor.cpp

@@ -11 +11 @@
 
         char *pBuf;
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
         int i,iNum=1,x=0;
@@ -85 +85 @@
     char *pBuf;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
-
-    if(MdiInfo[WndNum].DocType==WNDTYPE_TEXT){
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
+
+    if(MdiInfo[WndNum]->DocType==WNDTYPE_TEXT){
         //通常のテキストはすべてをデフォルトカラー（標準で黒）にする
         for(i=0;;i++){
             if(pBuf[i]=='\0') break;
-            MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
+            MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
         }
         return;
@@ -110 +110 @@
 
             BOOL bResult=0;
-            if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC){
+            if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC){
                 i3=IsBasicReservedWord(str);
                 bResult=IsManagementCommand(i3);
             }
-            else if(MdiInfo[WndNum].DocType==WNDTYPE_HTML){
+            else if(MdiInfo[WndNum]->DocType==WNDTYPE_HTML){
                 bResult=IsHtmlReservedWord(str);
             }
@@ -120 +120 @@
             if(bResult){
                 for(i3=i-i2;i3<i;i3++){
-                    MdiInfo[WndNum].pMdiTextEdit->pColorRef[i3]=tci.rgbStatement;
+                    MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i3]=tci.rgbStatement;
                 }
             }
             else{
                 for(i3=i-i2;i3<i;i3++){
-                    MdiInfo[WndNum].pMdiTextEdit->pColorRef[i3]=tci.rgbDefault;
+                    MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i3]=tci.rgbDefault;
                 }
             }
@@ -134 +134 @@
             if(IsStr||pBuf[i]=='\"'&&IsStr==0){
                 //文字列カラー（""で囲まれる範囲）
-                MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbString;
+                MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbString;
             }
             else{
                 //通常カラー
-                MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
+                MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
             }
         }
@@ -155 +155 @@
     //エディタ画面左端のコントロールタブ
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     HWND hEdit;
-    hEdit=GetWindow(MdiInfo[WndNum].hwnd,GW_CHILD);
+    hEdit=GetWindow(MdiInfo[WndNum]->hwnd,GW_CHILD);
     GetClientRect(hEdit,&rect);
 
@@ -180 +180 @@
 
     //ルーラーを再描画
-    InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
-    UpdateWindow(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd);
+    InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
+    UpdateWindow(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd);
 }
 
@@ -215 +215 @@
     char *pBuf;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     //ダブルクリック位置を取得（バッファインデックス）
@@ -327 +327 @@
 
     i=GetBufferIndexFromCaretPos(
-        MdiInfo[WndNum].pMdiTextEdit->buffer,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        MdiInfo[WndNum]->pMdiTextEdit->buffer,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
     GetCaretPosFromBufferIndex(
-        MdiInfo[WndNum].pMdiTextEdit->buffer,
-        i-lstrlen(MdiInfo[WndNum].IndentStr),
-        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+        MdiInfo[WndNum]->pMdiTextEdit->buffer,
+        i-lstrlen(MdiInfo[WndNum]->IndentStr),
+        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
 
     TextEdit_Replace(WndNum,"",1);
 
-    HeapDefaultFree(MdiInfo[WndNum].IndentStr);
-    MdiInfo[WndNum].IndentStr=0;
-}
+    HeapDefaultFree(MdiInfo[WndNum]->IndentStr);
+    MdiInfo[WndNum]->IndentStr=0;
+}

trunk/ab5.0/abdev/abdev/TextEditor_EventProc.cpp

@@ -43 +43 @@
             if(i==-1) return 0; //ウィンドウが初期状態の場合
 
-            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i].title.c_str());
+            i=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i,0);
             SetStatusText(NULL);
@@ -226 +226 @@
 
             int iControlTabSpace;
-            iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+            iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
             i=max(-si.nPos,min(i,si.nMax-((rect.right-iControlTabSpace)/font_width)-si.nPos));
@@ -238 +238 @@
 
             //ルーラーを再描画
-            InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
-            UpdateWindow(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd);
+            InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
+            UpdateWindow(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd);
 
             return 0;
@@ -259 +259 @@
                 WS_CHILD|WS_VISIBLE,
                 0,0,0,0,
-                MdiInfo[wParam].pMdiTextEdit->pobj_WebResult->hwnd,0,hInst,0);
+                MdiInfo[wParam]->pMdiTextEdit->pobj_WebResult->hwnd,0,hInst,0);
 
             SetWindowLongPtr(hOneTabWnd,GWLP_USERDATA,(long)lParam);

trunk/ab5.0/abdev/abdev/TextEditor_ImeEvent.cpp

@@ -11 +11 @@
 
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     HIMC hIMC;
@@ -20 +20 @@
     COMPOSITIONFORM CompForm;
     CompForm.dwStyle=CFS_POINT;
-    pos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+    pos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
     GetScrollBaseCaretPos(WndNum,(int *)&pos.x,(int *)&pos.y);
     CompForm.ptCurrentPos.x=pos.x*font_width+iControlTabSpace;
@@ -38 +38 @@
 
         int iControlTabSpace;
-        iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+        iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
         ////////////////////
@@ -62 +62 @@
         COMPOSITIONFORM CompForm;
         CompForm.dwStyle=CFS_POINT;
-        pos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+        pos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
         GetScrollBaseCaretPos(WndNum,(int *)&pos.x,(int *)&pos.y);
         CompForm.ptCurrentPos.x=pos.x*font_width+iControlTabSpace;

trunk/ab5.0/abdev/abdev/TextEditor_KeyEvent.cpp

@@ -14 +14 @@
         WndNum=GetWndNum(GetParent(hwnd));
 
-        if(MdiInfo[WndNum].pMdiTextEdit->iUnderStart!=-1){
+        if(MdiInfo[WndNum]->pMdiTextEdit->iUnderStart!=-1){
             //ハイパーリンク下線の表示を解除
-            MdiInfo[WndNum].pMdiTextEdit->iUnderStart=-1;
-            MdiInfo[WndNum].pMdiTextEdit->iUnderEnd=-1;
+            MdiInfo[WndNum]->pMdiTextEdit->iUnderStart=-1;
+            MdiInfo[WndNum]->pMdiTextEdit->iUnderEnd=-1;
 
             //再描画
@@ -159 +159 @@
     char *pBuf;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
     for(i=iPos;i>0;i--){
         if(pBuf[i-1]=='\r'&&pBuf[i]=='\n') return i+1;
@@ -242 +242 @@
             hide_caret_switch=1;
 
-            if(MdiInfo[WndNum].IndentStr){
+            if(MdiInfo[WndNum]->IndentStr){
                 //以前の自動インデントを消去する
                 CancelBeforeAutoIndent(WndNum);
             }
 
-            pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+            pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
             int StartX;
@@ -253 +253 @@
             //リプレイス前のカーソルバッファ位置を取得
             i=GetBufferIndexFromCaretPos(pBuf,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
-            StartX=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x;
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
+            StartX=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x;
 
             //リプレイス
             TextEdit_ReplaceUpdateUndoData(WndNum,temporary,0,1);
-            pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+            pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
             //リプレイス後のカーソル行のインデントをi3に取得
@@ -281 +281 @@
             }
 
-            if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC){
+            if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC){
                 //インデント追加のコマンドかどうかを判断
                 if(IsIndentAdditionCommand_FromBuffer(pBuf+i+i2)) i2++;
@@ -302 +302 @@
             */
             i=GetBufferIndexFromCaretPos(pBuf,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
             if(pBuf[i]=='\r'&&
                 pBuf[i+1]=='\n'){
                 //自動インデントを開始する（「\t\tⅠ」のような場合）
-                MdiInfo[WndNum].IndentStr=(char *)HeapAlloc(hHeap,0,i2+1);
-                memset(MdiInfo[WndNum].IndentStr,'\t',i2);
-                MdiInfo[WndNum].IndentStr[i2]=0;
-                TextEdit_Replace(WndNum,MdiInfo[WndNum].IndentStr,1);
+                MdiInfo[WndNum]->IndentStr=(char *)HeapAlloc(hHeap,0,i2+1);
+                memset(MdiInfo[WndNum]->IndentStr,'\t',i2);
+                MdiInfo[WndNum]->IndentStr[i2]=0;
+                TextEdit_Replace(WndNum,MdiInfo[WndNum]->IndentStr,1);
             }
             else{
@@ -334 +334 @@
     }
     else if(nVirtualKey==VK_TAB){
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
         TextEdit_GetSel(WndNum,&CharRange);
@@ -421 +421 @@
             //リプレイス
             TextEdit_ReplaceUpdateUndoData(WndNum,pTemp,0,0);
-            pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+            pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
             HeapDefaultFree(pTemp);
@@ -474 +474 @@
     ////////////////////////////////////////////
 
-    if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC)
+    if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC)
         TextEditEvent_StartAnalysis_Basic(hwnd,WndNum,nVirtualKey);
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_HTML){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_HTML){
         TextEditEvent_StartAnalysis_Html(hwnd,WndNum,nVirtualKey);
     }
@@ -490 +490 @@
 
     if(nVirtualKey==VK_LEFT||nVirtualKey==VK_UP||nVirtualKey==VK_RIGHT||nVirtualKey==VK_DOWN||nVirtualKey==VK_PRIOR||nVirtualKey==VK_NEXT){
-        if(MdiInfo[WndNum].IndentStr){
+        if(MdiInfo[WndNum]->IndentStr){
             //自動インデント中のインデントを無効にする
             CancelBeforeAutoIndent(WndNum);
@@ -508 +508 @@
             case VK_LEFT:
                 //上下キャレット移動時の左右位置保持機能を解除
-                MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
-
-                if((MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x&&
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)||
+                MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+
+                if((MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x&&
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)||
                     GetKeyState(VK_SHIFT)&0x8000){
                     //選択中でないとき、またはシフトキーが押されているとき
@@ -518 +518 @@
                 else{
                     //選択中のとき
-                    if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                        MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
-                    else if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
+                    if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                        MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
+                    else if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
                     else{
-                        if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x)
-                            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+                        if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x)
+                            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
                         else
-                            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
+                            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
                     }
                 }
@@ -532 +532 @@
             case VK_RIGHT:
                 //上下キャレット移動時の左右位置保持機能を解除
-                MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
-
-                if((MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x&&
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)||
+                MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+
+                if((MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x&&
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)||
                     GetKeyState(VK_SHIFT)&0x8000){
                     //選択中でないとき、またはシフトキーが押されているとき
                     GetNaturalCaretPos_Right(WndNum,
-                        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                 }
                 else{
                     //選択中のとき
-                    if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
-                    else if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                        MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+                    if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
+                    else if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                        MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
                     else{
-                        if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x)
-                            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
+                        if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x)
+                            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
                         else
-                            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+                            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
                     }
                 }
@@ -557 +557 @@
             case VK_UP:
                 if((GetKeyState(VK_CONTROL)&0x8000)&&
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x!=0){
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x!=0){
                     //行の先頭へキャレットを移動
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x=0;
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x=0;
 
                     //上下キャレット移動時の左右位置保持機能を解除
-                    MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+                    MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
                 }
                 else{
-                    if((MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x&&
-                        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)||
+                    if((MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x&&
+                        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)||
                         GetKeyState(VK_SHIFT)&0x8000){
                         //選択中でないとき、またはシフトキーが押されているとき
                         GetNaturalCaretPos_Up(WndNum,
-                            &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                            &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                     }
                     else{
                         //選択中のとき
-                        if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
-                        else if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
+                        if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
+                        else if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
                         else{
-                            if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x)
-                                MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+                            if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x)
+                                MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
                             else
-                                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
+                                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
                         }
 
                         GetNaturalCaretPos_Up(WndNum,
-                            &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                            &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                     }
                 }
                 break;
             case VK_DOWN:
-                i2=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y;
-                if((MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x&&
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)||
+                i2=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y;
+                if((MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x&&
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)||
                     GetKeyState(VK_SHIFT)&0x8000){
                     //選択中でないとき、またはシフトキーが押されているとき
                     GetNaturalCaretPos_Down(WndNum,
-                        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                 }
                 else{
                     //選択中のとき
-                    if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
-                    else if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y)
-                        MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+                    if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
+                    else if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y>MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y)
+                        MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
                     else{
-                        if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x)
-                            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=MdiInfo[WndNum].pMdiTextEdit->EndCaretPos;
+                        if(MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x<MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x)
+                            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos;
                         else
-                            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+                            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
                     }
 
                     GetNaturalCaretPos_Down(WndNum,
-                        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                 }
 
                 if(GetKeyState(VK_CONTROL)&0x8000){
-                    if(i2!=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y){
+                    if(i2!=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y){
                         //行の先頭へキャレットを移動
-                        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x=0;
+                        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x=0;
                     }
                     else{
@@ -625 +625 @@
                         CaretPos_LooseToNatural(WndNum,
                             INT_MAX,
-                            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y,
-                            &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y,
+                            &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                     }
 
                     //上下キャレット移動時の左右位置保持機能を解除
-                    MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+                    MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
                 }
                 break;
             case VK_PRIOR:
                 GetNaturalCaretPos_PageUp(WndNum,
-                    &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                    &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                 break;
             case VK_NEXT:
                 GetNaturalCaretPos_PageDown(WndNum,
-                    &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                    &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                 break;
         }
@@ -645 +645 @@
         if(!(GetKeyState(VK_SHIFT)&0x8000)){
             //シフトキーが押されていない、通常時
-            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
         }
 
@@ -672 +672 @@
 
         //上下キャレット移動時の左右位置保持機能を解除
-        MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+        MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
 
         if(GetKeyState(VK_CONTROL)&0x8000){
             //ファイルの先頭または末端へキャレットを移動
             if(nVirtualKey==VK_HOME){
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x=0;
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y=0;
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x=0;
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y=0;
             }
             else if(nVirtualKey==VK_END){
@@ -685 +685 @@
                     INT_MAX,
                     INT_MAX,
-                    &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                    &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
             }
         }
         else{
             //行の先頭または末端へキャレットを移動
-            if(nVirtualKey==VK_HOME) MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x=0;
+            if(nVirtualKey==VK_HOME) MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x=0;
             else if(nVirtualKey==VK_END){
                 //存在するキャレット位置に変換
                 CaretPos_LooseToNatural(WndNum,
                     INT_MAX,
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y,
-                    &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y,
+                    &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
             }
         }
@@ -702 +702 @@
         if(!(GetKeyState(VK_SHIFT)&0x8000)){
             //シフトキーが押されていない、通常時
-            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
         }
 
@@ -721 +721 @@
         TextEdit_GetSel(WndNum,&CharRange);
 
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
         //キャレットがファイルの終端にあるとき
@@ -727 +727 @@
 
         if(CharRange.cpMin==CharRange.cpMax){
-            if(MdiInfo[WndNum].IndentStr){
+            if(MdiInfo[WndNum]->IndentStr){
                 //自動インデントを有効にする
                 char temporary[1024];
-                lstrcpy(temporary,MdiInfo[WndNum].IndentStr);
+                lstrcpy(temporary,MdiInfo[WndNum]->IndentStr);
 
                 CancelBeforeAutoIndent(WndNum);
@@ -743 +743 @@
 
             GetCaretPosFromBufferIndex(
-                MdiInfo[WndNum].pMdiTextEdit->buffer,
+                MdiInfo[WndNum]->pMdiTextEdit->buffer,
                 CharRange.cpMax,
-                &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
+                &MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos);
         }
 
@@ -755 +755 @@
         /////////////////
 
-        if(MdiInfo[WndNum].IndentStr){
+        if(MdiInfo[WndNum]->IndentStr){
             //自動インデント中のインデントの場合、インデントの1文字を削除する
-            if(lstrlen(MdiInfo[WndNum].IndentStr)==1){
+            if(lstrlen(MdiInfo[WndNum]->IndentStr)==1){
                 //1文字しか残っていない場合は自動インデントそのものを消去する
                 CancelBeforeAutoIndent(WndNum);
             }
             else{
-                MdiInfo[WndNum].IndentStr[lstrlen(MdiInfo[WndNum].IndentStr)-1]=0;
+                MdiInfo[WndNum]->IndentStr[lstrlen(MdiInfo[WndNum]->IndentStr)-1]=0;
 
                 i=GetBufferIndexFromCaretPos(
-                    MdiInfo[WndNum].pMdiTextEdit->buffer,
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-                    MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+                    MdiInfo[WndNum]->pMdiTextEdit->buffer,
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+                    MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
                 GetCaretPosFromBufferIndex(
-                    MdiInfo[WndNum].pMdiTextEdit->buffer,
+                    MdiInfo[WndNum]->pMdiTextEdit->buffer,
                     i-1,
-                    &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+                    &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
                 TextEdit_Replace(WndNum,"",1);
             }
@@ -801 +801 @@
 
     char *pBuf;
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
 
@@ -836 +836 @@
 
         i=GetBufferIndexFromCaretPos(pBuf,
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
 
         i2=i-2;
@@ -974 +974 @@
 
     char *pBuf;
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
 
@@ -985 +985 @@
  
         i=GetBufferIndexFromCaretPos(pBuf,
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
 
         if(GetNowTagInfo(pBuf,i-1)){

trunk/ab5.0/abdev/abdev/TextEditor_MouseEvent.cpp

@@ -12 +12 @@
     if((GetKeyState(VK_CONTROL)&0x8000)&&pobj_nv->bCtrlKeyHyperLink){
         //Ctrlキーが押されているとき
-        if(MdiInfo[WndNum].pMdiTextEdit->iUnderStart!=-1){
+        if(MdiInfo[WndNum]->pMdiTextEdit->iUnderStart!=-1){
             //単語が選択可能なとき
 
             //半角文字列を選択時の全角とのズレを修正
             int start,end;
-            start=MdiInfo[WndNum].pMdiTextEdit->iUnderStart;
-            end=MdiInfo[WndNum].pMdiTextEdit->iUnderEnd;
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,start,&pos);
-            start=GetBufferIndexFromCaretPos(MdiInfo[WndNum].pMdiTextEdit->buffer,pos.x,pos.y);
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,end,&pos);
-            end=GetBufferIndexFromCaretPos(MdiInfo[WndNum].pMdiTextEdit->buffer,pos.x,pos.y);
+            start=MdiInfo[WndNum]->pMdiTextEdit->iUnderStart;
+            end=MdiInfo[WndNum]->pMdiTextEdit->iUnderEnd;
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,start,&pos);
+            start=GetBufferIndexFromCaretPos(MdiInfo[WndNum]->pMdiTextEdit->buffer,pos.x,pos.y);
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,end,&pos);
+            end=GetBufferIndexFromCaretPos(MdiInfo[WndNum]->pMdiTextEdit->buffer,pos.x,pos.y);
 
             int length;
@@ -32 +32 @@
             memcpy(
                 pTemp,
-                MdiInfo[WndNum].pMdiTextEdit->buffer+start,
+                MdiInfo[WndNum]->pMdiTextEdit->buffer+start,
                 length);
             pTemp[length]=0;
@@ -53 +53 @@
 
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
-
-    if(MdiInfo[WndNum].IndentStr){
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
+
+    if(MdiInfo[WndNum]->IndentStr){
         //自動インデント中のインデントを無効にする
         CancelBeforeAutoIndent(WndNum);
     }
 
-    MdiInfo[WndNum].pMdiTextEdit->bAutoScroll=0;
+    MdiInfo[WndNum]->pMdiTextEdit->bAutoScroll=0;
 
     //上下キャレット移動時の左右位置保持機能を解除
-    MdiInfo[WndNum].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+    MdiInfo[WndNum]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
 
     if(0<=(pMousePos->x) && (pMousePos->x)<iControlTabSpace){
@@ -74 +74 @@
             0,
             pMousePos->y,
-            &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
-        MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+            &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
+        MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
 
         ////////////
@@ -82 +82 @@
 
         char *pBuf;
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
         CHARRANGE CharRange;
         TextEdit_GetSel(WndNum,&CharRange);
@@ -101 +101 @@
             pMousePos->x-iControlTabSpace,
             pMousePos->y,
-            &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+            &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
 
         if(!(GetKeyState(VK_SHIFT)&0x8000)){
             //シフトキーが押されていない、通常時
-            MdiInfo[WndNum].pMdiTextEdit->EndCaretPos=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos;
+            MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos;
         }
 
@@ -123 +123 @@
 
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     if(0<=(pMousePos->x) && (pMousePos->x)<iControlTabSpace){
@@ -140 +140 @@
 
         //オートスクロールスレッドを停止
-        MdiInfo[WndNum].pMdiTextEdit->bAutoScroll=0;
+        MdiInfo[WndNum]->pMdiTextEdit->bAutoScroll=0;
 
         //編集メニューをリセット
@@ -160 +160 @@
     //エディタ画面左端のコントロールタブ
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
-
-
-    while(MdiInfo[WndNum].pMdiTextEdit->bAutoScroll){
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
+
+
+    while(MdiInfo[WndNum]->pMdiTextEdit->bAutoScroll){
         GetCursorPos(&pos);
         ScreenToClient(hwnd,&pos);
@@ -176 +176 @@
             pos.x,
             pos.y,
-            &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+            &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
 
         if(!TextEdit_ScrollCaret(WndNum,1))
@@ -195 +195 @@
 
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     if(GetCapture()==hwnd){
@@ -215 +215 @@
             ////////////////////////////
 
-            if(MdiInfo[WndNum].pMdiTextEdit->bAutoScroll){
+            if(MdiInfo[WndNum]->pMdiTextEdit->bAutoScroll){
                 //すでにオートスクロールスレッドが作動中のときは抜け出す
                 return;
@@ -221 +221 @@
 
             //オートスクロールスレッドを起動
-            MdiInfo[WndNum].pMdiTextEdit->bAutoScroll=1;
+            MdiInfo[WndNum]->pMdiTextEdit->bAutoScroll=1;
 
             _beginthread((void (__cdecl *)(void *))AutoScrollThread,0,(void *)hwnd);
@@ -227 +227 @@
             return;
         }
-        else if(MdiInfo[WndNum].pMdiTextEdit->bAutoScroll){
+        else if(MdiInfo[WndNum]->pMdiTextEdit->bAutoScroll){
             //オートスクロールを解除
-            MdiInfo[WndNum].pMdiTextEdit->bAutoScroll=0;
+            MdiInfo[WndNum]->pMdiTextEdit->bAutoScroll=0;
         }
 
@@ -243 +243 @@
             &pos);
 
-        if(pos.x!=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x||pos.y!=MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y){
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos=pos;
+        if(pos.x!=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x||pos.y!=MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y){
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos=pos;
 
             InvalidateRect(hwnd,NULL,0);
@@ -271 +271 @@
 
                 TextEdit_GetWordCaret(
-                    MdiInfo[WndNum].pMdiTextEdit->hEdit,
+                    MdiInfo[WndNum]->pMdiTextEdit->hEdit,
                     WndNum,
                     &pos,
-                    &MdiInfo[WndNum].pMdiTextEdit->iUnderStart,&MdiInfo[WndNum].pMdiTextEdit->iUnderEnd,
+                    &MdiInfo[WndNum]->pMdiTextEdit->iUnderStart,&MdiInfo[WndNum]->pMdiTextEdit->iUnderEnd,
                     WORDCARET_AFTER);
 
@@ -283 +283 @@
             }
             else{
-                if(MdiInfo[WndNum].pMdiTextEdit->iUnderStart!=-1){
-                    MdiInfo[WndNum].pMdiTextEdit->iUnderStart=-1;
-                    MdiInfo[WndNum].pMdiTextEdit->iUnderEnd=-1;
+                if(MdiInfo[WndNum]->pMdiTextEdit->iUnderStart!=-1){
+                    MdiInfo[WndNum]->pMdiTextEdit->iUnderStart=-1;
+                    MdiInfo[WndNum]->pMdiTextEdit->iUnderEnd=-1;
 
                     InvalidateRect(hwnd,NULL,0);
@@ -301 +301 @@
 
     int start,end;
-    TextEdit_GetWordCaret(hwnd,WndNum,&MdiInfo[WndNum].pMdiTextEdit->StartCaretPos,&start,&end,WORDCARET_AFTER);
+    TextEdit_GetWordCaret(hwnd,WndNum,&MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos,&start,&end,WORDCARET_AFTER);
 
     //セレクト
@@ -315 +315 @@
 
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     if(0<=(pMousePos->x) && (pMousePos->x)<iControlTabSpace){

trunk/ab5.0/abdev/abdev/TextEditor_UndoRedo.cpp

@@ -8 +8 @@
 
     //自動インデント中のインデントを無効にする
-    if(MdiInfo[WndNum].IndentStr) CancelBeforeAutoIndent(WndNum);
+    if(MdiInfo[WndNum]->IndentStr) CancelBeforeAutoIndent(WndNum);
 
-    pUndoState=MdiInfo[WndNum].pMdiTextEdit->pTextEditUndoState;
+    pUndoState=MdiInfo[WndNum]->pMdiTextEdit->pTextEditUndoState;
     i=pUndoState->NowPos-1;
     if(i==-1) i=MAX_UNDONUM-1;
@@ -20 +20 @@
 
     //選択範囲をセット
-    GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+    GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
         pUndoState->Range[pUndoState->NowPos].cpMin,
-        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
-    GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
+    GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
         pUndoState->Range[pUndoState->NowPos].cpMax,
-        &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
+        &MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos);
 
     switch(pUndoState->Command[pUndoState->NowPos]){
@@ -44 +44 @@
 
     //変更を通知
-    MdiInfo[WndNum].pMdiTextEdit->NofityUndoRedoToModify();
+    MdiInfo[WndNum]->pMdiTextEdit->NofityUndoRedoToModify();
 }
 void TextEdit_RedoCommand(int WndNum){
     TEXTEDIT_UNDOSTATE *pUndoState;
 
-    pUndoState=MdiInfo[WndNum].pMdiTextEdit->pTextEditUndoState;
+    pUndoState=MdiInfo[WndNum]->pMdiTextEdit->pTextEditUndoState;
     if(!pUndoState->Command[pUndoState->NowPos]){
         MessageBeep(0);
@@ -59 +59 @@
         case TEXTEDIT_UNDO_PASTE:
             //選択範囲をセット
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
                 pUndoState->Range[pUndoState->NowPos].cpMin,
-                &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+                &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
                 pUndoState->Range[pUndoState->NowPos].cpMin,
-                &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
+                &MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos);
 
             TextEdit_Replace(WndNum,pUndoState->KeyStr[pUndoState->NowPos],1);
@@ -70 +70 @@
         case TEXTEDIT_UNDO_SELKEY:
             //選択範囲をセット
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
                 pUndoState->DelRange[pUndoState->NowPos].cpMin,
-                &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
-            GetCaretPosFromBufferIndex(MdiInfo[WndNum].pMdiTextEdit->buffer,
+                &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
+            GetCaretPosFromBufferIndex(MdiInfo[WndNum]->pMdiTextEdit->buffer,
                 pUndoState->DelRange[pUndoState->NowPos].cpMax,
-                &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
+                &MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos);
 
             TextEdit_Replace(WndNum,pUndoState->KeyStr[pUndoState->NowPos],1);
@@ -91 +91 @@
 
     //変更を通知
-    MdiInfo[WndNum].pMdiTextEdit->NofityUndoRedoToModify();
+    MdiInfo[WndNum]->pMdiTextEdit->NofityUndoRedoToModify();
 }
 
@@ -107 +107 @@
     TEXTEDIT_UNDOSTATE *pUndoState;
 
-    pUndoState=MdiInfo[WndNum].pMdiTextEdit->pTextEditUndoState;
+    pUndoState=MdiInfo[WndNum]->pMdiTextEdit->pTextEditUndoState;
 
     //Redoされた場合の不要なデータを削除する

trunk/ab5.0/abdev/abdev/WebSearch.cpp

@@ -323 +323 @@
     iWindowWidth=size.cx+20;
 
-    if(MdiInfo[WndNum].pMdiTextEdit==0) return;
-    hTabWnd=(HWND)SendMessage(MdiInfo[WndNum].pMdiTextEdit->hEdit,WM_SEARCH_TAB_CREATE,(WPARAM)WndNum,(LPARAM)this);
+    if(MdiInfo[WndNum]->pMdiTextEdit==0) return;
+    hTabWnd=(HWND)SendMessage(MdiInfo[WndNum]->pMdiTextEdit->hEdit,WM_SEARCH_TAB_CREATE,(WPARAM)WndNum,(LPARAM)this);
 }
 COneTab::~COneTab(){
@@ -335 +335 @@
     }
 
-    if(MdiInfo[m_WndNum].pMdiTextEdit)
-        SendMessage(MdiInfo[m_WndNum].pMdiTextEdit->hEdit,WM_SEARCH_TAB_CLOSE,0,(LPARAM)hTabWnd);
+    if(MdiInfo[m_WndNum]->pMdiTextEdit)
+        SendMessage(MdiInfo[m_WndNum]->pMdiTextEdit->hEdit,WM_SEARCH_TAB_CLOSE,0,(LPARAM)hTabWnd);
 }
 
@@ -485 +485 @@
     COneTab *pobj_temp_OneTab;
     pobj_temp_OneTab=new COneTab(WndNum,lpszSearchText);
-    if(MdiInfo[WndNum].pMdiTextEdit==0){
+    if(MdiInfo[WndNum]->pMdiTextEdit==0){
         delete pobj_temp_OneTab;
         return;
@@ -579 +579 @@
         goto exit;
     }
-    if(MdiInfo[WndNum].pMdiTextEdit==0){
+    if(MdiInfo[WndNum]->pMdiTextEdit==0){
         goto exit;
     }
 
     //重複チェック
-    if(MdiInfo[WndNum].pMdiTextEdit->pobj_WebResult->DuplicateCheck(str)){
+    if(MdiInfo[WndNum]->pMdiTextEdit->pobj_WebResult->DuplicateCheck(str)){
         goto exit;
     }
@@ -590 +590 @@
 
 
-    MdiInfo[WndNum].pMdiTextEdit->pobj_WebResult->add(WndNum,str);
+    MdiInfo[WndNum]->pMdiTextEdit->pobj_WebResult->add(WndNum,str);
 
 exit:
@@ -858 +858 @@
 
     bShow=1;
-    ResizeOwnerWnd();   
+    ActiveBasic::IDE::Program::mainFrame.Resized(); 
 }
 

trunk/ab5.0/abdev/abdev/WindowControl.cpp

@@ -72 +72 @@
 
     for(i3=0;;i3++){
-        if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]==-1) break;
+        if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i3]==-1) break;
     }
     
@@ -85 +85 @@
 
     for(i3--;i3>=0;i3--){
-        ActiveBasic::PM::ChildWindowInfo *pChildInfo = projectInfo.windowInfos[WndInfoNum]->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]];
+        ActiveBasic::PM::ChildWindowInfo *pChildInfo = projectInfo.windowInfos[WndInfoNum]->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i3]];
 
         MemSize+=pChildInfo->GetName().size()+1+
@@ -145 +145 @@
     ActiveBasic::PM::ChildWindowInfo ChildInfo;
 
-    for(i2=1;i2<MAX_RAD_SELITEM;i2++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i2]=-1;
-
-    WndInfoNum=GetWndInfoNum(MdiInfo[WndNum].path);
+    for(i2=1;i2<MAX_RAD_SELITEM;i2++) MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i2]=-1;
+
+    WndInfoNum=GetWndInfoNum(MdiInfo[WndNum]->path);
     pByte=(BYTE *)GlobalLock(hGlobal);
     i3=*((int *)pByte);
@@ -184 +184 @@
         ChildInfo.pos.y+=10;
 
-        MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]=InsertDlgItem(WndNum,
+        MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i3]=InsertDlgItem(WndNum,
             WndInfoNum,
             -1,
@@ -2298 +2298 @@
     //ウィンドウが開かれている場合は閉じる
     for(i=0;i<MdiInfo.size();i++){
-        if(MdiInfo[i].hwnd&&lstrcmpi(pWindowInfo->GetName().c_str(),MdiInfo[i].path.c_str())==0){
-            SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0);
+        if(MdiInfo[i]->hwnd&&lstrcmpi(pWindowInfo->GetName().c_str(),MdiInfo[i]->path.c_str())==0){
+            SendMessage(MdiInfo[i]->hwnd,WM_CLOSE,0,0);
             break;
         }

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

@@ -100 +100 @@
     if(!IsWindow(hChild)) return -1;
     for(i=0;i<MdiInfo.size();i++){
-        if(hChild==MdiInfo[i].hwnd) break;
+        if(hChild==MdiInfo[i]->hwnd) break;
     }
     if(i==MdiInfo.size()) i=-1;
@@ -119 +119 @@
         projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
 
-        if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) return i;
+        if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0) return i;
     }
     return -1;
@@ -139 +139 @@
         if(WndNum==-1) break;
 
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
             //コントロールタブスペースの幅と行番号の文字数を更新
-            MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace=
-                GetControlTabSpace(WndNum,&MdiInfo[WndNum].pMdiTextEdit->iLineNumberTextCount);
-
-            InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->hEdit,NULL,0);
-            InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
-
-            SendTextEditResizeEvent(MdiInfo[WndNum].hwnd);
+            MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace=
+                GetControlTabSpace(WndNum,&MdiInfo[WndNum]->pMdiTextEdit->iLineNumberTextCount);
+
+            InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->hEdit,NULL,0);
+            InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
+
+            SendTextEditResizeEvent(MdiInfo[WndNum]->hwnd);
         }
         else{
@@ -165 +165 @@
     WndNum=GetWndNum(hChild);
     sw=0;
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-        if( MdiInfo[WndNum].pMdiTextEdit->IsModified() ) sw=1;
-    }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
-        if(MdiInfo[WndNum].MdiIconEditInfo->bModify) sw=1;
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
+        if( MdiInfo[WndNum]->pMdiTextEdit->IsModified() ) sw=1;
+    }
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
+        if(MdiInfo[WndNum]->MdiIconEditInfo->bModify) sw=1;
     }
 
@@ -205 +205 @@
     if(WndNum==-1) return;
     hChild=GetWindow(hChild,GW_CHILD);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         //////////////////////
         // テキストエディタ
@@ -211 +211 @@
 
         //サイズ
-        BufSize=(double)lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer);
+        BufSize=(double)lstrlen(MdiInfo[WndNum]->pMdiTextEdit->buffer);
         if(IsWindow(hChild)){
             if(BufSize<1024) sprintf(temporary,"%s: %.0fByte",STRING_SIZE,BufSize);
@@ -231 +231 @@
             //日本語
             sprintf(temporary,"%d 行、%d 列",
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y+1,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x+1);
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y+1,
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x+1);
 #else
             //英語
             sprintf(temporary,"%d : %d",
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y+1,
-                MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x+1);
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y+1,
+                MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x+1);
 #endif
         }
@@ -244 +244 @@
 
         //文字コード
-        nkf.GetCharCodeName(MdiInfo[WndNum].pMdiTextEdit->iCharCode,temporary);
+        nkf.GetCharCodeName(MdiInfo[WndNum]->pMdiTextEdit->iCharCode,temporary);
         SendMessage(hStatusBar,SB_SETTEXT,3,(LPARAM)temporary);
 
         //文字コード
-        nkf.GetLfCodeName(MdiInfo[WndNum].pMdiTextEdit->iLfCode,temporary);
+        nkf.GetLfCodeName(MdiInfo[WndNum]->pMdiTextEdit->iLfCode,temporary);
         SendMessage(hStatusBar,SB_SETTEXT,4,(LPARAM)temporary);
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
         ////////////////
         // RADツール
         ////////////////
 
-        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
         if(RadInfo.NowDragging>=FRAME_CHANGEPOS_START&&RadInfo.NowDragging<=FRAME_CHANGEPOS_END){
             sprintf(temporary,"pos %d, %d",
-                RadInfo.DraggingRect[0].left-MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
-                RadInfo.DraggingRect[0].top-MdiInfo[WndNum].MdiRadInfo->ClientPos.y);
+                RadInfo.DraggingRect[0].left-MdiInfo[WndNum]->MdiRadInfo->ClientPos.x,
+                RadInfo.DraggingRect[0].top-MdiInfo[WndNum]->MdiRadInfo->ClientPos.y);
             SendMessage(hStatusBar,SB_SETTEXT,1,(LPARAM)temporary);
             sprintf(temporary,"size %d * %d",
@@ -267 +267 @@
             SendMessage(hStatusBar,SB_SETTEXT,2,(LPARAM)temporary);
         }
-        else if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+        else if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
             SendMessage(hStatusBar,SB_SETTEXT,1,(LPARAM)"pos 0, 0");
             sprintf(temporary,"size %d * %d",pWindowInfo->size.cx,pWindowInfo->size.cy);
@@ -274 +274 @@
         else{
             sprintf(temporary,"pos %d, %d",
-                pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.x,
-                pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.y);
+                pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.x,
+                pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.y);
             SendMessage(hStatusBar,SB_SETTEXT,1,(LPARAM)temporary);
             sprintf(temporary,"size %d * %d",
-                pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->size.cx,
-                pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->size.cy);
+                pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->size.cx,
+                pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->size.cy);
             SendMessage(hStatusBar,SB_SETTEXT,2,(LPARAM)temporary);
         }
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_MENU){
         //////////////////
         // MENU エディタ
@@ -291 +291 @@
         SendMessage(hStatusBar,SB_SETTEXT,2,(LPARAM)"");
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
         //////////////////
         // ICON エディタ
@@ -314 +314 @@
         pobj_StandardToolbar->EnableItem(IDM_REDO,0);
     }
-    else if(IS_DOCUMENT_TEXT(MdiInfo[i].DocType)){
-        i2=MdiInfo[i].pMdiTextEdit->pTextEditUndoState->NowPos-1;
+    else if(IS_DOCUMENT_TEXT(MdiInfo[i]->DocType)){
+        i2=MdiInfo[i]->pMdiTextEdit->pTextEditUndoState->NowPos-1;
         if(i2==-1) i2=MAX_UNDONUM-1;
-        if(!MdiInfo[i].pMdiTextEdit->pTextEditUndoState->Command[i2]){
+        if(!MdiInfo[i]->pMdiTextEdit->pTextEditUndoState->Command[i2]){
             pobj_MainMenu->EnableItem(IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
             EnableMenuItem(hEditMenu,IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
@@ -327 +327 @@
             pobj_StandardToolbar->EnableItem(IDM_UNDO,1);
         }
-        if(!MdiInfo[i].pMdiTextEdit->pTextEditUndoState->Command[MdiInfo[i].pMdiTextEdit->pTextEditUndoState->NowPos]){
+        if(!MdiInfo[i]->pMdiTextEdit->pTextEditUndoState->Command[MdiInfo[i]->pMdiTextEdit->pTextEditUndoState->NowPos]){
             pobj_MainMenu->EnableItem(IDM_REDO,MF_BYCOMMAND|MF_GRAYED);
             EnableMenuItem(hEditMenu,IDM_REDO,MF_BYCOMMAND|MF_GRAYED);
@@ -338 +338 @@
         }
     }
-    else if(MdiInfo[i].DocType==WNDTYPE_RAD){
-        i2=MdiInfo[i].MdiRadInfo->undo.NowPos-1;
+    else if(MdiInfo[i]->DocType==WNDTYPE_RAD){
+        i2=MdiInfo[i]->MdiRadInfo->undo.NowPos-1;
         if(i2==-1) i2=MAX_UNDONUM-1;
-        if(!MdiInfo[i].MdiRadInfo->undo.Command[i2]){
+        if(!MdiInfo[i]->MdiRadInfo->undo.Command[i2]){
             pobj_MainMenu->EnableItem(IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
             EnableMenuItem(hEditMenu,IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
@@ -351 +351 @@
             pobj_StandardToolbar->EnableItem(IDM_UNDO,1);
         }
-        if(!MdiInfo[i].MdiRadInfo->undo.Command[MdiInfo[i].MdiRadInfo->undo.NowPos]){
+        if(!MdiInfo[i]->MdiRadInfo->undo.Command[MdiInfo[i]->MdiRadInfo->undo.NowPos]){
             pobj_MainMenu->EnableItem(IDM_REDO,MF_BYCOMMAND|MF_GRAYED);
             EnableMenuItem(hEditMenu,IDM_REDO,MF_BYCOMMAND|MF_GRAYED);
@@ -362 +362 @@
         }
     }
-    else if(MdiInfo[i].DocType==WNDTYPE_MENU){
+    else if(MdiInfo[i]->DocType==WNDTYPE_MENU){
         pobj_MainMenu->EnableItem(IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
         EnableMenuItem(hEditMenu,IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
@@ -371 +371 @@
         pobj_StandardToolbar->EnableItem(IDM_REDO,0);
     }
-    else if(MdiInfo[i].DocType==WNDTYPE_ICONEDIT){
-        i2=MdiInfo[i].MdiIconEditInfo->undo[MdiInfo[i].MdiIconEditInfo->SelectIconNum].NowPos-1;
+    else if(MdiInfo[i]->DocType==WNDTYPE_ICONEDIT){
+        i2=MdiInfo[i]->MdiIconEditInfo->undo[MdiInfo[i]->MdiIconEditInfo->SelectIconNum].NowPos-1;
         if(i2==-1) i2=MAX_ICONEDIT_UNDONUM-1;
-        if(!MdiInfo[i].MdiIconEditInfo->undo[MdiInfo[i].MdiIconEditInfo->SelectIconNum].lpData[i2]){
+        if(!MdiInfo[i]->MdiIconEditInfo->undo[MdiInfo[i]->MdiIconEditInfo->SelectIconNum].lpData[i2]){
             pobj_MainMenu->EnableItem(IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
             EnableMenuItem(hEditMenu,IDM_UNDO,MF_BYCOMMAND|MF_GRAYED);
@@ -384 +384 @@
             pobj_StandardToolbar->EnableItem(IDM_UNDO,1);
         }
-        if(!MdiInfo[i].MdiIconEditInfo->undo[MdiInfo[i].MdiIconEditInfo->SelectIconNum].lpData[MdiInfo[i].MdiIconEditInfo->undo[MdiInfo[i].MdiIconEditInfo->SelectIconNum].NowPos]){
+        if(!MdiInfo[i]->MdiIconEditInfo->undo[MdiInfo[i]->MdiIconEditInfo->SelectIconNum].lpData[MdiInfo[i]->MdiIconEditInfo->undo[MdiInfo[i]->MdiIconEditInfo->SelectIconNum].NowPos]){
             pobj_MainMenu->EnableItem(IDM_REDO,MF_BYCOMMAND|MF_GRAYED);
             EnableMenuItem(hEditMenu,IDM_REDO,MF_BYCOMMAND|MF_GRAYED);
@@ -454 +454 @@
     WndNum=GetWndNum(hChild);
     if(WndNum==-1) return;
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         pobj_MainMenu->EnableItem(IDM_ALLSELECT,MF_BYCOMMAND|MF_ENABLED);
         pobj_MainMenu->EnableItem(IDM_FIND,MF_BYCOMMAND|MF_ENABLED);
@@ -466 +466 @@
         hChild=GetWindow(hChild,GW_CHILD);
         if(!(
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.x&&
-            MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum].pMdiTextEdit->EndCaretPos.y
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x&&
+            MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y==MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y
             )){
             MenuMsg=MF_BYCOMMAND|MF_ENABLED;
@@ -502 +502 @@
         ResetState_ConvMenu(bConvEnable);
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
         //検索、置換、文字カウントを無効化
         pobj_MainMenu->EnableItem(IDM_FIND,MF_BYCOMMAND|MF_GRAYED);
@@ -511 +511 @@
         pobj_StandardToolbar->EnableItem(IDM_FIND,0);
 
-        if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
+        if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
             //切り取り、コピー、削除を有効化
             pobj_MainMenu->EnableItem(IDM_CUT,MF_BYCOMMAND|MF_GRAYED);
@@ -548 +548 @@
         ResetState_ConvMenu(0);
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_MENU){
         //検索、置換、文字カウントを無効化
         pobj_MainMenu->EnableItem(IDM_FIND,MF_BYCOMMAND|MF_GRAYED);
@@ -571 +571 @@
         ResetState_ConvMenu(0);
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
         //検索、置換、文字カウントを無効化
         pobj_MainMenu->EnableItem(IDM_FIND,MF_BYCOMMAND|MF_GRAYED);
@@ -580 +580 @@
         pobj_StandardToolbar->EnableItem(IDM_FIND,0);
 
-        if(MdiInfo[WndNum].MdiIconEditInfo->SelectLevel==0){
+        if(MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel==0){
             //切り取り、コピー、削除を無効化
             pobj_MainMenu->EnableItem(IDM_CUT,MF_BYCOMMAND|MF_GRAYED);
@@ -645 +645 @@
     if( WndNum != -1 )
     {
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
             pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_ENABLED);
 
@@ -726 +726 @@
     int i;
     for(i=0;i<MdiInfo.size();i++){
-        if(MdiInfo[i].hwnd){
-            if(lstrcmpi(MdiInfo[i].title.c_str(),lpszTitle)==0){
+        if(MdiInfo[i]->hwnd){
+            if(lstrcmpi(MdiInfo[i]->title.c_str(),lpszTitle)==0){
                 lstrcat(lpszTitle,"_");
                 DuplicateTitleCheck(lpszTitle);
@@ -735 +735 @@
     }
 }
-HWND NewTextEditWindow(char *filepath,_int8 DocumentType,COLORREF TabColor){
+HWND NewTextEditWindow(char *filepath,_int8 DocumentType,COLORREF TabColor)
+{
     int i;
     char str[MAX_PATH],str2[32],*buffer;
@@ -746 +747 @@
 
         //すでに指定されたファイルが開かれている場合
-        hChild=GetWindow(hClient,GW_CHILD);
+        hChild=::GetWindow(hClient,GW_CHILD);
         while(hChild){
             i=GetWndNum(hChild);
-            if(IS_DOCUMENT_TEXT(MdiInfo[i].DocType)){
-                if(lstrcmpi(MdiInfo[i].path.c_str(),filepath)==0) break;
-            }
-            hChild=GetNextWindow(hChild,GW_HWNDNEXT);
+            if(IS_DOCUMENT_TEXT(MdiInfo[i]->DocType)){
+                if(lstrcmpi(MdiInfo[i]->path.c_str(),filepath)==0) break;
+            }
+            hChild=::GetNextWindow(hChild,GW_HWNDNEXT);
         }
         if(hChild){
             //前面に表示して終了
-            BringWindowToTop(hChild);
+            ::BringWindowToTop(hChild);
             return hChild;
         }
@@ -769 +770 @@
         if(hFile==INVALID_HANDLE_VALUE){
             sprintf(str,STRING_ERROR_CANT_FILEOPEN,filepath);
-            MessageBox(hOwner,str,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
+            ::MessageBox(hOwner,str,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
             return 0;
         }
@@ -853 +854 @@
     else{
         buffer=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
+        extern int DocumentCounter;
         DocumentCounter++;
         sprintf(str,"Document[%d]",DocumentCounter);
@@ -866 +868 @@
     mdic.szTitle=str;
 
-    hChild=GetWindow(hClient,GW_CHILD);
-    if(IsWindow(hChild)){
-        if(IsZoomed(hChild)) mdic.style=WS_MAXIMIZE;
+    hChild=::GetWindow(hClient,GW_CHILD);
+    if(::IsWindow(hChild)){
+        if(::IsZoomed(hChild)) mdic.style=WS_MAXIMIZE;
         else mdic.style=0;
     }
@@ -883 +885 @@
     mdic.lParam=(LPARAM)shfi.hIcon;
 
-    mdic.style|=WS_CLIPCHILDREN;
+    mdic.style |= WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
     hChild=(HWND)SendMessage(hClient,WM_MDICREATE,0,(long)&mdic);   //ウィンドウ作成
 
     //TextEditorコントロールを設置
-    GetClientRect(hChild,&rect);
+    ::GetClientRect(hChild,&rect);
     hEdit=CreateWindow("TextEditor",NULL,
         WS_CHILD|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE,
@@ -895 +897 @@
 
     //ウィンドウのID登録
-    MdiInfo.push_back( MDIINFO() );
+    MdiInfo.push_back( new MDIINFO() );
     i = MdiInfo.size()-1;
-    MdiInfo[i].hwnd=hChild;
-    MdiInfo[i].DocType=DocumentType;
+    MdiInfo[i]->hwnd=hChild;
+    MdiInfo[i]->DocType=DocumentType;
     DuplicateTitleCheck(str);
-    MdiInfo[i].title = str;
+    MdiInfo[i]->title = str;
     if(filepath)
     {
-        MdiInfo[i].path = filepath;
+        MdiInfo[i]->path = filepath;
     }
     else
     {
-        MdiInfo[i].path = "";
-    }
-
-    MdiInfo[i].pMdiTextEdit = new CMdiTextEdit( &MdiInfo[i] );
-
-    MdiInfo[i].pMdiTextEdit->hEdit=hEdit;
-    MdiInfo[i].pMdiTextEdit->pobj_WebResult=new CWebResult(hChild);
-    MdiInfo[i].pMdiTextEdit->pobj_Ruler=new CRuler(hChild,i);
-    MdiInfo[i].pMdiTextEdit->hIcon=shfi.hIcon;
-    MdiInfo[i].pMdiTextEdit->buffer=buffer;
-    MdiInfo[i].pMdiTextEdit->pColorRef=(COLORREF *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(COLORREF)*lstrlen(buffer));
-    MdiInfo[i].pMdiTextEdit->iUnderStart=-1;
-    MdiInfo[i].pMdiTextEdit->iUnderEnd=-1;
-    MdiInfo[i].pMdiTextEdit->StartCaretPos.x=0;
-    MdiInfo[i].pMdiTextEdit->StartCaretPos.y=0;
-    MdiInfo[i].pMdiTextEdit->EndCaretPos.x=0;
-    MdiInfo[i].pMdiTextEdit->EndCaretPos.y=0;
-    MdiInfo[i].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
-    MdiInfo[i].pMdiTextEdit->bAutoScroll=0;
-    MdiInfo[i].pMdiTextEdit->iWidth_ControlTabSpace=
-        GetControlTabSpace(i,&MdiInfo[i].pMdiTextEdit->iLineNumberTextCount);
-    MdiInfo[i].pMdiTextEdit->iCharCode=iCharCode;
-    MdiInfo[i].pMdiTextEdit->iLfCode=iLfCode;
-    MdiInfo[i].IndentStr=0;
+        MdiInfo[i]->path = "";
+    }
+
+    MdiInfo[i]->pMdiTextEdit = new CMdiTextEdit( MdiInfo[i] );
+
+    MdiInfo[i]->pMdiTextEdit->hEdit=hEdit;
+    MdiInfo[i]->pMdiTextEdit->pobj_WebResult=new CWebResult(hChild);
+    MdiInfo[i]->pMdiTextEdit->pobj_Ruler=new CRuler(hChild,i);
+    MdiInfo[i]->pMdiTextEdit->hIcon=shfi.hIcon;
+    MdiInfo[i]->pMdiTextEdit->buffer=buffer;
+    MdiInfo[i]->pMdiTextEdit->pColorRef=(COLORREF *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(COLORREF)*lstrlen(buffer));
+    MdiInfo[i]->pMdiTextEdit->iUnderStart=-1;
+    MdiInfo[i]->pMdiTextEdit->iUnderEnd=-1;
+    MdiInfo[i]->pMdiTextEdit->StartCaretPos.x=0;
+    MdiInfo[i]->pMdiTextEdit->StartCaretPos.y=0;
+    MdiInfo[i]->pMdiTextEdit->EndCaretPos.x=0;
+    MdiInfo[i]->pMdiTextEdit->EndCaretPos.y=0;
+    MdiInfo[i]->pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+    MdiInfo[i]->pMdiTextEdit->bAutoScroll=0;
+    MdiInfo[i]->pMdiTextEdit->iWidth_ControlTabSpace=
+        GetControlTabSpace(i,&MdiInfo[i]->pMdiTextEdit->iLineNumberTextCount);
+    MdiInfo[i]->pMdiTextEdit->iCharCode=iCharCode;
+    MdiInfo[i]->pMdiTextEdit->iLfCode=iLfCode;
+    MdiInfo[i]->IndentStr=0;
 
 
@@ -944 +946 @@
     //Docコンボボックスに追加
     extern HWND hDocCombo;
-    i=SendMessage(hDocCombo,CB_ADDSTRING,0,(long)str);
-    SendMessage(hDocCombo,CB_SETCURSEL,i,0);
+    if( hDocCombo )
+    {
+        i=SendMessage(hDocCombo,CB_ADDSTRING,0,(long)str);
+        SendMessage(hDocCombo,CB_SETCURSEL,i,0);
+    }
 
     //タブに追加
     pobj_MainTab->InsertItem( str, true, TabColor );
 
-    SetFocus(hEdit);
+    ::SetFocus(hEdit);
     SetStatusText(NULL);
 
@@ -958 +963 @@
     if( DocumentType == WNDTYPE_BASIC && !projectInfo.IsOpened() ){
         // 単体ソースコードを開いたとき
-        if( !IsWindowVisible( hProjectView ) ){
+        extern HWND hProjectView;
+        if( !::IsWindowVisible( hProjectView ) ){
             // クラスビューを表示する
             SendMessage(hOwner,WM_COMMAND,IDM_PROJECTVIEW,0);
@@ -973 +979 @@
     int i2,i3;
 
-    MdiInfo[WndNum].hwnd=0;
+    MdiInfo[WndNum]->hwnd=0;
 
     //ドキュメントコンボボックスから文字列を消去
     extern HWND hDocCombo;
-    i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
+    i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
     SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
 
     //タブコントロールからアイテムを消去
-    if(pobj_MainTab) pobj_MainTab->DeleteItem( MdiInfo[WndNum].title.c_str(), true );
-
-
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(pobj_MainTab) pobj_MainTab->DeleteItem( MdiInfo[WndNum]->title.c_str(), true );
+
+
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         ////////////////////////////
         // テキストエディタを閉じる
@@ -996 +1002 @@
         }
 
-        HeapDefaultFree(MdiInfo[WndNum].pMdiTextEdit->buffer);
-        HeapDefaultFree(MdiInfo[WndNum].pMdiTextEdit->pColorRef);
-
-        if(MdiInfo[WndNum].IndentStr) HeapDefaultFree(MdiInfo[WndNum].IndentStr);
+        HeapDefaultFree(MdiInfo[WndNum]->pMdiTextEdit->buffer);
+        HeapDefaultFree(MdiInfo[WndNum]->pMdiTextEdit->pColorRef);
+
+        if(MdiInfo[WndNum]->IndentStr) HeapDefaultFree(MdiInfo[WndNum]->IndentStr);
 
         //エディットコントロールを破棄
-        DestroyWindow(MdiInfo[WndNum].pMdiTextEdit->hEdit);
+        DestroyWindow(MdiInfo[WndNum]->pMdiTextEdit->hEdit);
 
         //Web検索ウィンドウを破棄
-        delete MdiInfo[WndNum].pMdiTextEdit->pobj_WebResult;
-        MdiInfo[WndNum].pMdiTextEdit->pobj_WebResult=0;
+        delete MdiInfo[WndNum]->pMdiTextEdit->pobj_WebResult;
+        MdiInfo[WndNum]->pMdiTextEdit->pobj_WebResult=0;
 
         //ルーラーウィンドウを破棄
-        delete MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler;
-        MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler=0;
+        delete MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler;
+        MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler=0;
 
         //アイコンを破棄
-        if(MdiInfo[WndNum].pMdiTextEdit->hIcon) DestroyIcon(MdiInfo[WndNum].pMdiTextEdit->hIcon);
-
-        delete MdiInfo[WndNum].pMdiTextEdit;
-        MdiInfo[WndNum].pMdiTextEdit=0;
-    }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
+        if(MdiInfo[WndNum]->pMdiTextEdit->hIcon) DestroyIcon(MdiInfo[WndNum]->pMdiTextEdit->hIcon);
+
+        delete MdiInfo[WndNum]->pMdiTextEdit;
+        MdiInfo[WndNum]->pMdiTextEdit=0;
+    }
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
         /////////////////////
         // RADツールを閉じる
@@ -1024 +1030 @@
 
         for(i2=0;i2<MAX_UNDONUM;i2++){
-            if(MdiInfo[WndNum].MdiRadInfo->undo.Command[i2])
+            if(MdiInfo[WndNum]->MdiRadInfo->undo.Command[i2])
                 Rad_DeleteUndoData(WndNum,i2);
         }
-        DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hTools);
-        DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hRad);
-        SelectObject(MdiInfo[WndNum].MdiRadInfo->hMemDC,MdiInfo[WndNum].MdiRadInfo->hOldBitmap);
-        DeleteDC(MdiInfo[WndNum].MdiRadInfo->hMemDC);
-        DeleteObject(MdiInfo[WndNum].MdiRadInfo->hBitmap);
-        GlobalFree(MdiInfo[WndNum].MdiRadInfo);
-    }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
+        DestroyWindow(MdiInfo[WndNum]->MdiRadInfo->hTools);
+        DestroyWindow(MdiInfo[WndNum]->MdiRadInfo->hRad);
+        SelectObject(MdiInfo[WndNum]->MdiRadInfo->hMemDC,MdiInfo[WndNum]->MdiRadInfo->hOldBitmap);
+        DeleteDC(MdiInfo[WndNum]->MdiRadInfo->hMemDC);
+        DeleteObject(MdiInfo[WndNum]->MdiRadInfo->hBitmap);
+        GlobalFree(MdiInfo[WndNum]->MdiRadInfo);
+    }
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_MENU){
         ////////////////////////////
         // メニューエディタを閉じる
         ////////////////////////////
 
-        DestroyWindow(MdiInfo[WndNum].MdiMenuInfo->hList);
-        GlobalFree(MdiInfo[WndNum].MdiMenuInfo);
-    }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+        DestroyWindow(MdiInfo[WndNum]->MdiMenuInfo->hList);
+        GlobalFree(MdiInfo[WndNum]->MdiMenuInfo);
+    }
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
         ////////////////////////////
         // アイコンエディタを閉じる
         ////////////////////////////
 
-        for(i2=0;i2<MdiInfo[WndNum].MdiIconEditInfo->num;i2++){
+        for(i2=0;i2<MdiInfo[WndNum]->MdiIconEditInfo->num;i2++){
             for(i3=0;i3<MAX_ICONEDIT_UNDONUM;i3++){
-                if(MdiInfo[WndNum].MdiIconEditInfo->undo[i2].lpData[i3])
-                    HeapDefaultFree(MdiInfo[WndNum].MdiIconEditInfo->undo[i2].lpData[i3]);
-            }
-        }
-
-        DeleteDC(MdiInfo[WndNum].MdiIconEditInfo->memdc);
-        DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hMemBmp);
-        DestroyWindow(MdiInfo[WndNum].MdiIconEditInfo->hMain);
-        for(i2=0;i2<MdiInfo[WndNum].MdiIconEditInfo->num;i2++){
-            HeapDefaultFree(MdiInfo[WndNum].MdiIconEditInfo->pIconImage[i2]);
-        }
-        HeapDefaultFree(MdiInfo[WndNum].MdiIconEditInfo);
+                if(MdiInfo[WndNum]->MdiIconEditInfo->undo[i2].lpData[i3])
+                    HeapDefaultFree(MdiInfo[WndNum]->MdiIconEditInfo->undo[i2].lpData[i3]);
+            }
+        }
+
+        DeleteDC(MdiInfo[WndNum]->MdiIconEditInfo->memdc);
+        DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hMemBmp);
+        DestroyWindow(MdiInfo[WndNum]->MdiIconEditInfo->hMain);
+        for(i2=0;i2<MdiInfo[WndNum]->MdiIconEditInfo->num;i2++){
+            HeapDefaultFree(MdiInfo[WndNum]->MdiIconEditInfo->pIconImage[i2]);
+        }
+        HeapDefaultFree(MdiInfo[WndNum]->MdiIconEditInfo);
     }
     else
@@ -1067 +1073 @@
     }
 
-    Jenga::Common::EraseVectorItem<std::vector<MDIINFO>>( MdiInfo, WndNum );
+    delete MdiInfo[WndNum];
+    Jenga::Common::EraseVectorItem<std::vector<MDIINFO *>>( MdiInfo, WndNum );
 }
 void ResizeTextEditWnd(HWND hwnd,int cx,int cy){
@@ -1082 +1089 @@
     if(pobj_nv->bEditor_Ruler){
         //ルーラー
-        MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->resize(
+        MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->resize(
             0,
             0,
@@ -1090 +1097 @@
         iHeightRuler=HEIGHT_RULER;
 
-        ShowWindow(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd,SW_SHOW);
+        ShowWindow(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd,SW_SHOW);
     }
     else{
         iHeightRuler=0;
 
-        ShowWindow(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd,SW_HIDE);
+        ShowWindow(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd,SW_HIDE);
     }
 
     //エディットウィンドウ
-    MoveWindow(MdiInfo[WndNum].pMdiTextEdit->hEdit,
+    MoveWindow(MdiInfo[WndNum]->pMdiTextEdit->hEdit,
         0,
         iHeightRuler,
@@ -1107 +1114 @@
 
     //Web検索ウィンドウ
-    MdiInfo[WndNum].pMdiTextEdit->pobj_WebResult->resize(
+    MdiInfo[WndNum]->pMdiTextEdit->pobj_WebResult->resize(
         0,
         cy-WebResultWndHeight,
@@ -1149 +1156 @@
             //ドキュメント セレクト コンボボックス
             extern HWND hDocCombo;
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i].title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[i]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i2,0);
 
             //タブコントロール
-            pobj_MainTab->MdiActiveEvent(MdiInfo[i].title.c_str());
+            pobj_MainTab->MdiActiveEvent(MdiInfo[i]->title.c_str());
 
             if( !projectInfo.IsOpened() ){
@@ -1183 +1190 @@
     return DefMDIChildProc(hwnd,message,wParam,lParam);
 }
-void ResizeOwnerWnd(void){
-    int width_owner,height_owner;
-    int height_Rebar;
-    int height_MdiClient;
-    RECT rect,StatusRect,RebarRect;
-
-    GetClientRect(hOwner,&rect);
-    width_owner=rect.right;
-    height_owner=rect.bottom;
-
-    //Rebar
-    SendMessage(pobj_Rebar->hRebar,WM_SIZE,0,MAKELONG(width_owner,height_owner));
-    UpdateWindow(pobj_Rebar->hRebar);
-
-    //Status bar
-#define STATUSBAR_PARTS_NUM 5
-    int sb_size[STATUSBAR_PARTS_NUM];
-    sb_size[0]=width_owner-340;
-    sb_size[1]=width_owner-220;
-    sb_size[2]=width_owner-120;
-    sb_size[3]=width_owner-50;
-    sb_size[4]=width_owner;
-    SendMessage(hStatusBar,SB_SETPARTS,STATUSBAR_PARTS_NUM,(LPARAM)sb_size);
-    SendMessage(hStatusBar,WM_SIZE,0,MAKELONG(width_owner,height_owner));
-    UpdateWindow(hStatusBar);
-
-    //Status bar
-    int height_Statusbar;
-    SendMessage(hStatusBar,SB_GETRECT,0,(long)&StatusRect);
-    height_Statusbar=StatusRect.bottom;
-
-    GetWindowRect(pobj_Rebar->hRebar,&RebarRect);
-    height_Rebar=RebarRect.bottom-RebarRect.top+2;
-
-    int height_dv;  //Width of Debugger View
-    int height_cv;  //Width of Compiler View
-    height_dv=0;
-    height_cv=0;
-#ifndef THETEXT
-    if(bClipCompileView){
-        if(pobj_Debugger->IsDebuggerView()){
-            //デバッガビューが表示されているとき
-            height_dv=pobj_nv->height_ClipDebuggerView+LEVER_THICK;
-        }
-        if(hCompileView){
-            //コンパイラビューが表示されているとき
-            height_cv=pobj_nv->height_ClipCompileView+LEVER_THICK;
-        }
-    }
-#endif
-
-    int width_pjv=0;    //Width of Project View
-    if(pobj_nv->bClipProjectView){
-        if(IsWindowVisible(hProjectView)){
-            //プロジェクトビューが表示されているとき
-            width_pjv=pobj_nv->width_ClipProjectView+LEVER_THICK;
-        }
-    }
-
-    int width_SideWeb=0;
-    if( pobj_SideWeb )
-    {
-        if(pobj_SideWeb->bShow){
-            width_SideWeb=pobj_nv->width_WebSearchView+LEVER_THICK;
-        }
-    }
-
-    //MDIクライアントの高さ
-    height_MdiClient=height_owner-(
-        height_Rebar+
-        height_dv+
-        height_cv+
-        height_Statusbar
-        );
-
-    //タブコントロール
-    int tab_height;
-    if(TabCtrl_GetItemCount(pobj_MainTab->hTab)==0) tab_height=0;
-    else{
-        RECT rc;
-        TabCtrl_GetItemRect(pobj_MainTab->hTab,0,&rc);
-        tab_height=rc.bottom-rc.top;
-    }
-    MoveWindow(pobj_MainTab->hTab,
-        width_pjv,
-        height_Rebar,
-        width_owner-width_pjv-width_SideWeb,
-        tab_height,
-        1);
-
-    //MDIクライアント
-    MoveWindow(hClient,
-        width_pjv,
-        height_Rebar+tab_height,
-        width_owner-width_pjv-width_SideWeb,
-        height_MdiClient-tab_height,
-        1);
-
-    if( pobj_SideWeb )
-    {
-        if(pobj_SideWeb->bShow){
-            //SideWeb
-            pobj_SideWeb->resize(
-                width_owner - pobj_nv->width_WebSearchView,
-                height_Rebar,
-                pobj_nv->width_WebSearchView,
-                height_MdiClient);
-        }
-        else pobj_SideWeb->resize(0,0,0,0);
-    }
-
-    if(width_pjv){
-        //プロジェクトビュー
-        MoveWindow(hProjectView,
-            0,
-            height_Rebar,
-            pobj_nv->width_ClipProjectView,
-            height_MdiClient,
-            1);
-        InvalidateRect(hProjectView,NULL,0);
-    }
-
-    if(height_dv){
-#ifndef THETEXT
-        //デバッガビュー
-        pobj_Debugger->resize(
-            0,
-            height_Rebar+height_MdiClient+LEVER_THICK,
-            width_owner,
-            pobj_nv->height_ClipDebuggerView);
-#endif
-    }
-    if(height_cv){
-        //コンパイラビュー
-        MoveWindow(hCompileView,
-            0,
-            height_Rebar+height_MdiClient+height_dv+LEVER_THICK,
-            width_owner,
-            pobj_nv->height_ClipCompileView,
-            1);
-    }
-}
 
 WNDPROC oldMainFrameWndProc;
@@ -1353 +1218 @@
             //コンパイラウィンドウ（埋め込み型）が表示されたとき
             hCompileView=(HWND)lParam;
-            ResizeOwnerWnd();
+            ActiveBasic::IDE::Program::mainFrame.Resized();
             return 0;
         case WM_DESTROYCOMPILEVIEW:
@@ -1365 +1230 @@
                 hCompileView=0;
                 
-                ResizeOwnerWnd();
+                ActiveBasic::IDE::Program::mainFrame.Resized();
             }
             return 0;
@@ -1389 +1254 @@
             //デバッガウィンドウ（埋め込み型）が表示されたとき
             pobj_Debugger->watch_start((HWND)lParam);
-            ResizeOwnerWnd();
+            ActiveBasic::IDE::Program::mainFrame.Resized();
             return 0;
         case WM_DESTROYDEBUGGERVIEW:
             //デバッガウィンドウ（埋め込み型）が破棄されたとき
             pobj_Debugger->watch_quit();
-            ResizeOwnerWnd();
+            ActiveBasic::IDE::Program::mainFrame.Resized();
             return 0;
 #endif
-
-        case WM_SIZE:
-            ResizeOwnerWnd();
-            return 0;
 
 
@@ -1442 +1303 @@
                 }
 
-                ResizeOwnerWnd();
+                ActiveBasic::IDE::Program::mainFrame.Resized();
                 UpdateWindow(hwnd);
             }
@@ -1717 +1578 @@
             if( projectInfo.IsOpened() ){
                 for(i=0,i2=0;i<MdiInfo.size();i++){
-                    if(MdiInfo[i].hwnd&&MdiInfo[i].DocType==WNDTYPE_RAD){
-                        if(IsDialogMessage(MdiInfo[i].MdiRadInfo->hProp_Dlg,&msg)) i2=1;
+                    if(MdiInfo[i]->hwnd&&MdiInfo[i]->DocType==WNDTYPE_RAD){
+                        if(IsDialogMessage(MdiInfo[i]->MdiRadInfo->hProp_Dlg,&msg)) i2=1;
                     }
                 }

trunk/ab5.0/abdev/abdev/abdev.h

@@ -48 +48 @@
 HWND hClient;                   //MDIクライアントウィンドウ
 HWND hStatusBar;                //ステータスバー
-std::vector<MDIINFO> MdiInfo;   //MDIドキュメントウィンドウ情報
+std::vector<MDIINFO *> MdiInfo; //MDIドキュメントウィンドウ情報
 
 /* メニュー */

trunk/ab5.0/abdev/abdev/abdev.vcproj

@@ -429 +429 @@
                 Name="Window Components"
                 >
-                <File
-                    RelativePath=".\src\WindowComponents\MdiWindow.cpp"
-                    >
-                </File>
                 <Filter
                     Name="PartialManager"
@@ -2809 +2805 @@
                         >
                     </File>
+                </Filter>
+                <Filter
+                    Name="MdiChildFrame"
+                    >
                 </Filter>
             </Filter>

trunk/ab5.0/abdev/abdev/include/MainFrame.h

@@ -19 +19 @@
 
 class MainFrame
-    : public WindowComponents::BaseWindow
+    : public WindowComponents::MdiWindow
 {
     WindowAreaManager wam;
-    WindowComponents::MdiWindow *mdiWindow;
 
 public:
+    // リサイズ時のリフレッシュ
+    void Resized();
 
     // WebブラウザでURLを開く
@@ -70 +71 @@
     // ファイルがドロップされた
     void OnDropFiles( HDROP hDropInfo );
+
+    // 再描画
+    void OnPaint( HDC dummy );
 
     // ソースコード表示メッセージ
@@ -252 +256 @@
     BEGIN_MSG_MAP( MainFrame )
         MESSAGE_HANDLER( WM_CREATE, OnCreate )
+        MSG_WM_SIZE( OnSize )
         MSG_WM_QUERYENDSESSION( OnQueryEndSession )
         MSG_WM_CLOSE( OnClose )
@@ -263 +268 @@
         MSG_WM_NOTIFY( OnNotify );
         MSG_WM_DROPFILES( OnDropFiles )
+        MSG_WM_PAINT( OnPaint )
         MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine )
 
@@ -366 +372 @@
         COMMAND_ID_HANDLER_EX( IDM_BLUE, OnCmdColor )
         COMMAND_ID_HANDLER_EX( IDM_YELLOW, OnCmdColor )
+
+        CHAIN_MSG_MAP(CUpdateUI<WindowComponents::MdiWindow>)
+        CHAIN_MSG_MAP(CMDIFrameWindowImpl<WindowComponents::MdiWindow>)
     END_MSG_MAP()
 };

trunk/ab5.0/abdev/abdev/include/Program.h

@@ -6 +6 @@
 class Program
 {
-    static MainFrame mainFrame;
 
     static void InitializeWindow();
 public:
+    static MainFrame mainFrame;
     static CAppModule _Module;
 

trunk/ab5.0/abdev/abdev/include/ProjectManager/WindowManager.h

@@ -123 +123 @@
     const std::string GetSourceFileName() const
     {
+        return this->GetName() + ".ab";
+    }
+
+    const std::string GetSourceFileNameForOldVer( const std::string &baseDir ) const
+    {
+        if( Jenga::Common::Path( baseDir + this->GetName() + ".ab" ).IsExistFile() )
+        {
+            return this->GetName() + ".ab";
+        }
+        if( Jenga::Common::Path( baseDir + this->GetName() + ".abp" ).IsExistFile() )
+        {
+            return this->GetName() + ".abp";
+        }
+        if( Jenga::Common::Path( baseDir + this->GetName() + ".sbp" ).IsExistFile() )
+        {
+            return this->GetName() + ".sbp";
+        }
         return this->GetName() + ".ab";
     }

trunk/ab5.0/abdev/abdev/include/WindowAreaManager.h

@@ -15 +15 @@
 
     void Add();
-    void AddMdiWindow( WindowComponents::MdiWindow *mdiWindow );
-
-    WindowComponents::MdiWindow *mdiWindow;
+    void AddMdiClientWindow( HWND hMdiClientWnd );
 };
 

trunk/ab5.0/abdev/abdev/include/WindowCollection.h

@@ -6 +6 @@
 class WindowCollection
 {
-    WindowComponents::MdiWindow *mdiWindow;
+    HWND hMdiClientWnd;
     WindowComponents::BaseWindowPtrs windows;
 public:
 
     WindowCollection()
-        : mdiWindow( NULL )
+        : hMdiClientWnd( NULL )
     {
     }
-    WindowCollection( WindowComponents::MdiWindow *mdiWindow )
-        : mdiWindow( mdiWindow )
+    WindowCollection( HWND hMdiClientWnd )
+        : hMdiClientWnd( hMdiClientWnd )
     {
     }

trunk/ab5.0/abdev/abdev/include/WindowComponents/MdiWindow.h

@@ -29 +29 @@
     }
 
-    BEGIN_UPDATE_UI_MAP(MdiWindow)
+    BEGIN_UPDATE_UI_MAP( MdiWindow )
         // エントリなし
     END_UPDATE_UI_MAP()
-
-    BEGIN_MSG_MAP_EX(MdiWindow)
-        MSG_WM_CREATE(OnCreate)
-        COMMAND_ID_HANDLER_EX(ID_APP_EXIT, OnFileExit)
-        COMMAND_ID_HANDLER_EX(ID_FILE_NEW, OnFileNew)
-        COMMAND_ID_HANDLER_EX(ID_WINDOW_CASCADE, OnWindowCascade)
-        COMMAND_ID_HANDLER_EX(ID_WINDOW_TILE_HORZ, OnWindowTile)
-        COMMAND_ID_HANDLER_EX(ID_WINDOW_ARRANGE, OnWindowArrangeIcons)
-        CHAIN_MSG_MAP(CUpdateUI<MdiWindow>)
-        CHAIN_MSG_MAP(CMDIFrameWindowImpl<MdiWindow>)
-    END_MSG_MAP()
-
-    LRESULT OnCreate(LPCREATESTRUCT lpcs);
-
-    void OnFileExit(UINT uNotifyCode, int nID, HWND hWndCtl){
-        PostMessage(WM_CLOSE);
-    }
-
-    void OnFileNew(UINT uNotifyCode, int nID, HWND hWndCtl){
-        // 子ウィンドウを作成
-        MdiChild *child = new MdiChild();
-        child->CreateEx( m_hWndClient );
-    }
-
-    void OnWindowCascade(UINT uNotifyCode, int nID, HWND hWndCtl){
-        // 子ウィンドウを重ねて表示
-        MDICascade();
-    }
-
-    void OnWindowTile(UINT uNotifyCode, int nID, HWND hWndCtl){
-        // 子ウィンドウを上下に並べて表示
-        MDITile();
-    }
-
-    void OnWindowArrangeIcons(UINT uNotifyCode, int nID, HWND hWndCtl){
-        // 最小化された子ウィンドウのアイコンを整列
-        MDIIconArrange();
-    }
 };
 

trunk/ab5.0/abdev/abdev/menu.cpp

@@ -131 +131 @@
 BOOL CMenuEx::SetIcon(int itemID,HICON hIcon){
     //アイコンをセット
-    int i;
-    for(i=0;i<iMenuItemNum;i++){
+    
+    for( int i=0; i<iMenuItemNum; i++ )
+    {
         if(ppobj_MenuItemData[i]->itemID==itemID){
             ppobj_MenuItemData[i]->hIcon=hIcon;
@@ -151 +152 @@
     }
     return 0;
+}
+
+int CMenuEx::FindSubMenuIndex( const std::string &itemStr )
+{
+    for( int i=0; i<iMenuItemNum; i++ )
+    {
+        if( itemStr == ppobj_MenuItemData[i]->str )
+        {
+            return i;
+        }
+    }
+    return -1;
 }
 

trunk/ab5.0/abdev/abdev/menu.h

@@ -69 +69 @@
     BOOL SetIcon(int itemID,HICON hIcon);
 
+    int FindSubMenuIndex( const std::string &itemStr );
+
 
 private:

trunk/ab5.0/abdev/abdev/nkf_class.cpp

@@ -169 +169 @@
                 break;
             }
-            if(!IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+            if(!IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
                 //テキストドキュメントでないとき
                 EndDialog(hwnd,0);
@@ -180 +180 @@
             SendMessage(hList,LB_ADDSTRING,0,(long)"JIS");
             SendMessage(hList,LB_ADDSTRING,0,(long)"UTF-8");
-            SendMessage(hList,LB_SETCURSEL,MdiInfo[WndNum].pMdiTextEdit->iCharCode,0);
+            SendMessage(hList,LB_SETCURSEL,MdiInfo[WndNum]->pMdiTextEdit->iCharCode,0);
 
             hList=GetDlgItem(hwnd,IDC_LIST_LFCODE);
@@ -186 +186 @@
             SendMessage(hList,LB_ADDSTRING,0,(long)"LF(Unix)");
             SendMessage(hList,LB_ADDSTRING,0,(long)"CR(Macintosh)");
-            SendMessage(hList,LB_SETCURSEL,MdiInfo[WndNum].pMdiTextEdit->iLfCode,0);
+            SendMessage(hList,LB_SETCURSEL,MdiInfo[WndNum]->pMdiTextEdit->iLfCode,0);
             break;
         case WM_COMMAND:
@@ -192 +192 @@
                 case IDOK:
                     //文字コードを取得
-                    MdiInfo[WndNum].pMdiTextEdit->iCharCode=
+                    MdiInfo[WndNum]->pMdiTextEdit->iCharCode=
                         (int)SendDlgItemMessage(hwnd,IDC_LIST_CHARCODE,LB_GETCURSEL,0,0);
 
                     //改行コードを取得
-                    MdiInfo[WndNum].pMdiTextEdit->iLfCode=
+                    MdiInfo[WndNum]->pMdiTextEdit->iLfCode=
                         (int)SendDlgItemMessage(hwnd,IDC_LIST_LFCODE,LB_GETCURSEL,0,0);
 

trunk/ab5.0/abdev/abdev/rebar.cpp

@@ -182 +182 @@
                 ResetState_DocMenu();
 
-                ResizeOwnerWnd();
+                ActiveBasic::IDE::Program::mainFrame.Resized();
             }
             return;

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -8 +8 @@
 void ResetTextEditFont(HWND hwnd);
 
+void MainFrame::Resized()
+{
+    int width_owner,height_owner;
+    int height_Rebar;
+    int height_MdiClient;
+    RECT rect,StatusRect,RebarRect;
+
+    this->GetClientRect( &rect );
+    width_owner=rect.right;
+    height_owner=rect.bottom;
+
+    //Rebar
+    SendMessage(pobj_Rebar->hRebar,WM_SIZE,0,MAKELONG(width_owner,height_owner));
+    ::UpdateWindow(pobj_Rebar->hRebar);
+
+    //Status bar
+#define STATUSBAR_PARTS_NUM 5
+    int sb_size[STATUSBAR_PARTS_NUM];
+    sb_size[0]=width_owner-340;
+    sb_size[1]=width_owner-220;
+    sb_size[2]=width_owner-120;
+    sb_size[3]=width_owner-50;
+    sb_size[4]=width_owner;
+    extern HWND hStatusBar;
+    ::SendMessage(hStatusBar,SB_SETPARTS,STATUSBAR_PARTS_NUM,(LPARAM)sb_size);
+    ::SendMessage(hStatusBar,WM_SIZE,0,MAKELONG(width_owner,height_owner));
+    ::UpdateWindow(hStatusBar);
+
+    //Status bar
+    int height_Statusbar;
+    SendMessage(hStatusBar,SB_GETRECT,0,(long)&StatusRect);
+    height_Statusbar=StatusRect.bottom;
+
+    ::GetWindowRect(pobj_Rebar->hRebar,&RebarRect);
+    height_Rebar=RebarRect.bottom-RebarRect.top+2;
+
+    int height_dv;  //Width of Debugger View
+    int height_cv;  //Width of Compiler View
+    height_dv=0;
+    height_cv=0;
+#ifndef THETEXT
+    extern BOOL bClipCompileView;
+    if(bClipCompileView){
+        if(pobj_Debugger->IsDebuggerView()){
+            //デバッガビューが表示されているとき
+            height_dv=pobj_nv->height_ClipDebuggerView+LEVER_THICK;
+        }
+
+        extern HWND hCompileView;
+        if(hCompileView){
+            //コンパイラビューが表示されているとき
+            height_cv=pobj_nv->height_ClipCompileView+LEVER_THICK;
+        }
+    }
+#endif
+
+    int width_pjv=0;    //Width of Project View
+    if(pobj_nv->bClipProjectView){
+        extern HWND hProjectView;
+        if(::IsWindowVisible(hProjectView)){
+            //プロジェクトビューが表示されているとき
+            width_pjv=pobj_nv->width_ClipProjectView+LEVER_THICK;
+        }
+    }
+
+    int width_SideWeb=0;
+    if( pobj_SideWeb )
+    {
+        if(pobj_SideWeb->bShow){
+            width_SideWeb=pobj_nv->width_WebSearchView+LEVER_THICK;
+        }
+    }
+
+    //MDIクライアントの高さ
+    height_MdiClient=height_owner-(
+        height_Rebar+
+        height_dv+
+        height_cv+
+        height_Statusbar
+        );
+
+    //タブコントロール
+    int tab_height;
+    if(TabCtrl_GetItemCount(pobj_MainTab->hTab)==0) tab_height=0;
+    else{
+        RECT rc;
+        TabCtrl_GetItemRect(pobj_MainTab->hTab,0,&rc);
+        tab_height=rc.bottom-rc.top;
+    }
+    ::MoveWindow(pobj_MainTab->hTab,
+        width_pjv,
+        height_Rebar,
+        width_owner-width_pjv-width_SideWeb,
+        tab_height,
+        1);
+
+    //MDIクライアント
+    ::MoveWindow(
+        hClient,
+        width_pjv,
+        height_Rebar+tab_height,
+        width_owner-width_pjv-width_SideWeb,
+        height_MdiClient-tab_height,
+        1
+    );
+
+    if( pobj_SideWeb )
+    {
+        if(pobj_SideWeb->bShow){
+            //SideWeb
+            pobj_SideWeb->resize(
+                width_owner - pobj_nv->width_WebSearchView,
+                height_Rebar,
+                pobj_nv->width_WebSearchView,
+                height_MdiClient);
+        }
+        else pobj_SideWeb->resize(0,0,0,0);
+    }
+
+    if(width_pjv){
+        //プロジェクトビュー
+        extern HWND hProjectView;
+        ::MoveWindow(hProjectView,
+            0,
+            height_Rebar,
+            pobj_nv->width_ClipProjectView,
+            height_MdiClient,
+            1);
+        ::InvalidateRect(hProjectView,NULL,0);
+    }
+
+    if(height_dv){
+#ifndef THETEXT
+        //デバッガビュー
+        pobj_Debugger->resize(
+            0,
+            height_Rebar+height_MdiClient+LEVER_THICK,
+            width_owner,
+            pobj_nv->height_ClipDebuggerView);
+#endif
+    }
+    if(height_cv){
+        //コンパイラビュー
+        extern HWND hCompileView;
+        ::MoveWindow(hCompileView,
+            0,
+            height_Rebar+height_MdiClient+height_dv+LEVER_THICK,
+            width_owner,
+            pobj_nv->height_ClipCompileView,
+            1);
+    }
+}
+
 void MainFrame::OpenWebBrowser( const std::string &url )
 {
@@ -27 +180 @@
 
     // MDIベースを作成
-    mdiWindow = new MdiWindow();
-    mdiWindow->Create(
-        m_hWnd,
-        rect,
-        NULL,
-        WS_CHILD
-    );
-    wam.AddMdiWindow( mdiWindow );
+    // フレームウィンドウのビューウィンドウを作成
+    int indexOfWindowSubMenu = pobj_MainMenu->FindSubMenuIndex( "ウィンドウ(&W)" );
+    HMENU hWindowSubMenu = NULL;
+    if( indexOfWindowSubMenu != -1 )
+    {
+        hWindowSubMenu = GetSubMenu( pobj_MainMenu->hMenu, indexOfWindowSubMenu );
+    }
+    CreateMDIClient( hWindowSubMenu );
+    wam.AddMdiClientWindow( m_hWndClient );
+
+    // TODO: hClientを廃止し、m_hWndClientに統一すること
+    extern HWND hClient;
+    hClient = m_hWndClient;
+
+    // メッセージループにメッセージフィルタとアイドルハンドラを追加
+    CMessageLoop* pLoop = Program::_Module.GetMessageLoop();
+    pLoop->AddMessageFilter(this);
+    pLoop->AddIdleHandler(this);
 
 
@@ -58 +221 @@
 void MainFrame::OnSize(UINT nType, CSize size)
 {
-    //mdiWindow->MoveWindow( 0, 0, size.cx, size.cy );
+    this->Resized();
 }
 
@@ -147 +310 @@
 void MainFrame::OnDestroy()
 {
-    mdiWindow->DestroyWindow();
-    delete mdiWindow;
-
     ::PostQuitMessage( 0 );
 }
@@ -257 +417 @@
         //レバーオブジェクトが存在するとき
         if(pnmh->hwndFrom==pobj_Rebar->hRebar&&pnmh->code==RBN_HEIGHTCHANGE){
-            ResizeOwnerWnd();
+            this->Resized();
             return 0;
         }
@@ -316 +476 @@
                 mii.dwTypeData=temporary;
                 mii.fType=MFT_STRING;
-                if(!MdiInfo[WndNum].path.empty()){
-                    _splitpath(MdiInfo[WndNum].path.c_str(),NULL,NULL,temporary,temp2);
+                if(!MdiInfo[WndNum]->path.empty()){
+                    _splitpath(MdiInfo[WndNum]->path.c_str(),NULL,NULL,temporary,temp2);
                     lstrcat(temporary,temp2);
                     lstrcat(temporary," を保存(&S)");
@@ -329 +489 @@
                 /*「絶対パスをコピー」「フォルダを開く」「ファイルを削除」
                                                 コマンドを場合によって無効化にする */
-                if(!MdiInfo[WndNum].path.empty()){
+                if(!MdiInfo[WndNum]->path.empty()){
                     EnableMenuItem(hTabMenu,IDM_PATH_COPY,MF_BYCOMMAND|MF_ENABLED);
                     EnableMenuItem(hTabMenu,IDM_FOLDER_OPEN,MF_BYCOMMAND|MF_ENABLED);
@@ -364 +524 @@
     }
     DragFinish(hDropInfo);
+}
+
+void MainFrame::OnPaint( HDC dummy )
+{
+    PAINTSTRUCT ps;
+    HDC hdc = this->BeginPaint( &ps );
+
+    HBRUSH hBrush = CreateSolidBrush( GetSysColor( COLOR_3DFACE ) );
+
+    RECT rect;
+    this->GetClientRect( &rect );
+
+    FillRect( hdc, &rect, hBrush );
+
+    DeleteObject( hBrush );
+
+    this->EndPaint( &ps );
 }
 
@@ -382 +559 @@
     while(hChild){
         WndNum=GetWndNum(hChild);
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-            if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) break;
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
+            if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0) break;
         }
         hChild=::GetNextWindow(hChild,GW_HWNDNEXT);
@@ -398 +575 @@
     ::UpdateWindow(hChild);
 
-    char *pTemp=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    char *pTemp=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     //行の先頭インデックスを取得（取得する行の番号はwParamで渡される）
@@ -549 +726 @@
 {
     for( int i=0;i<MdiInfo.size();i++){
-        if(MdiInfo[i].hwnd) SaveDocument(MdiInfo[i].hwnd,NULL);
+        if(MdiInfo[i]->hwnd) SaveDocument(MdiInfo[i]->hwnd,NULL);
     }
     if( projectInfo.IsOpened() )
@@ -585 +762 @@
     if(!hChild) return;
     int WndNum=GetWndNum(hChild);
-    if( IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType) )
+    if( IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType) )
     {
         TextEdit_UndoCommand(WndNum);
     }
-    else if( MdiInfo[WndNum].DocType == WNDTYPE_RAD )
+    else if( MdiInfo[WndNum]->DocType == WNDTYPE_RAD )
     {
         Rad_UndoCommand(WndNum);
     }
-    else if( MdiInfo[WndNum].DocType == WNDTYPE_ICONEDIT )
+    else if( MdiInfo[WndNum]->DocType == WNDTYPE_ICONEDIT )
     {
         IconEdit_UndoCommand(WndNum);
@@ -604 +781 @@
     if(!hChild) return;
     int WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType))
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType))
         TextEdit_RedoCommand(WndNum);
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD)
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD)
         Rad_RedoCommand(WndNum);
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT)
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT)
         IconEdit_RedoCommand(WndNum);
 }
@@ -616 +793 @@
     HWND hChild=::GetWindow(hClient,GW_CHILD);
     int WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         HWND hEdit=::GetWindow(hChild,GW_CHILD);
 
@@ -624 +801 @@
         HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE,CharRange.cpMax-CharRange.cpMin+1);
         char *pTemp=(char *)GlobalLock(hGlobal);
-        memcpy(pTemp,MdiInfo[WndNum].pMdiTextEdit->buffer+CharRange.cpMin,CharRange.cpMax-CharRange.cpMin);
+        memcpy(pTemp,MdiInfo[WndNum]->pMdiTextEdit->buffer+CharRange.cpMin,CharRange.cpMax-CharRange.cpMin);
         pTemp[CharRange.cpMax-CharRange.cpMin]=0;
         GlobalUnlock(hGlobal);
@@ -637 +814 @@
         SendMessage(hEdit,WM_KEYDOWN,VK_DELETE,0);
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
-        int indexOfWndInfo = GetWndInfoNum(MdiInfo[WndNum].path);
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
+        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
+        int indexOfWndInfo = GetWndInfoNum(MdiInfo[WndNum]->path);
 
         //クリップボードに格納するためのデータを用意する
-        pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.x-=17;
-        pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.y-=10;
+        pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.x-=17;
+        pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.y-=10;
         HGLOBAL hGlobal=Rad_GetChildInfoClipboardData(WndNum,indexOfWndInfo);
-        pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.x+=17;
-        pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->pos.y+=10;
+        pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.x+=17;
+        pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->pos.y+=10;
 
         OpenClipboard();
@@ -654 +831 @@
         CloseClipboard();
 
-        SendMessage(MdiInfo[WndNum].MdiRadInfo->hRad,WM_COMMAND,IDM_RAD_ITEM_DELETE,0);
-    }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+        SendMessage(MdiInfo[WndNum]->MdiRadInfo->hRad,WM_COMMAND,IDM_RAD_ITEM_DELETE,0);
+    }
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
         //クリップボードに格納するためのデータを用意する
         HGLOBAL hGlobal=IconEdit_GetChildInfoClipboardData(WndNum);
@@ -666 +843 @@
         CloseClipboard();
 
-        DeleteObject(MdiInfo[WndNum].MdiIconEditInfo->hSelectingBmp);
-        MdiInfo[WndNum].MdiIconEditInfo->SelectLevel=0;
-
-        IconEdit_EraseRect(WndNum,&MdiInfo[WndNum].MdiIconEditInfo->DraggingRect);
+        DeleteObject(MdiInfo[WndNum]->MdiIconEditInfo->hSelectingBmp);
+        MdiInfo[WndNum]->MdiIconEditInfo->SelectLevel=0;
+
+        IconEdit_EraseRect(WndNum,&MdiInfo[WndNum]->MdiIconEditInfo->DraggingRect);
     }
 }
@@ -677 +854 @@
     HWND hChild=::GetWindow(hClient,GW_CHILD);
     int WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         HWND hEdit = ::GetWindow(hChild,GW_CHILD);
 
@@ -685 +862 @@
         HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE,CharRange.cpMax-CharRange.cpMin+1);
         char *pTemp=(char *)GlobalLock(hGlobal);
-        memcpy(pTemp,MdiInfo[WndNum].pMdiTextEdit->buffer+CharRange.cpMin,CharRange.cpMax-CharRange.cpMin);
+        memcpy(pTemp,MdiInfo[WndNum]->pMdiTextEdit->buffer+CharRange.cpMin,CharRange.cpMax-CharRange.cpMin);
         pTemp[CharRange.cpMax-CharRange.cpMin]=0;
         GlobalUnlock(hGlobal);
@@ -695 +872 @@
         CloseClipboard();
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-        int indexOfWndInfo = GetWndInfoNum(MdiInfo[WndNum].path);
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
+        int indexOfWndInfo = GetWndInfoNum(MdiInfo[WndNum]->path);
 
         //クリップボードに格納するためのデータを用意する
@@ -707 +884 @@
         CloseClipboard();
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
         //クリップボードに格納するためのデータを用意する
         HGLOBAL hGlobal=IconEdit_GetChildInfoClipboardData(WndNum);
@@ -722 +899 @@
     HWND hChild=::GetWindow(hClient,GW_CHILD);
     int WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         HWND hEdit=::GetWindow(hChild,GW_CHILD);
 
@@ -762 +939 @@
         ResetCaretPos(WndNum);
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
         OpenClipboard();
         extern DWORD dwRadClipboardID;
@@ -773 +950 @@
         CloseClipboard();
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
         OpenClipboard();
         HGLOBAL hGlobal=GetClipboardData(CF_BITMAP);
@@ -789 +966 @@
     HWND hChild=::GetWindow(hClient,GW_CHILD);
     int WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         HWND hEdit=::GetWindow(hChild,GW_CHILD);
         TextEdit_ReplaceUpdateUndoData(WndNum,"",0,1);
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD)
-        SendMessage(MdiInfo[WndNum].MdiRadInfo->hRad,WM_COMMAND,IDM_RAD_ITEM_DELETE,0);
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD)
+        SendMessage(MdiInfo[WndNum]->MdiRadInfo->hRad,WM_COMMAND,IDM_RAD_ITEM_DELETE,0);
 }
 
@@ -801 +978 @@
     HWND hChild=::GetWindow(hClient,GW_CHILD);
     int WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
         HWND hEdit=::GetWindow(hChild,GW_CHILD);
 
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x=0;
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y=0;
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x=0;
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y=0;
 
         GetCaretPosFromBufferIndex(
-            MdiInfo[WndNum].pMdiTextEdit->buffer,
-            lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer),
-            &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
+            MdiInfo[WndNum]->pMdiTextEdit->buffer,
+            lstrlen(MdiInfo[WndNum]->pMdiTextEdit->buffer),
+            &MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos);
 
         ::InvalidateRect(hEdit,NULL,0);
@@ -816 +993 @@
         ResetState_EditMenu();
     }
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD){
+        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum]->path);
         for( int i3=0; i3<static_cast<int>(pWindowInfo->childWindowInfos.size()); i3++ )
         {
-            MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3] = i3;
+            MdiInfo[WndNum]->MdiRadInfo->SelectingItem[i3] = i3;
         }
         DrawRadWindow(WndNum,pWindowInfo);
@@ -880 +1057 @@
 
     //再配置
-    ResizeOwnerWnd();
+    this->Resized();
 
     ::ShowWindow(hClient,SW_SHOW);
@@ -991 +1168 @@
         //単独ソースコード
         if(!SetRunning(hChild)) return;
-        if(IsNeedCompile(MdiInfo[GetWndNum(hChild)].path,1))
-            sprintf(temporary,"\"%s\" /debug /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
+        if(IsNeedCompile(MdiInfo[GetWndNum(hChild)]->path,1))
+            sprintf(temporary,"\"%s\" /debug /run /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
         else
-            sprintf(temporary,"\"%s\" /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
+            sprintf(temporary,"\"%s\" /run /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
 
         //ブレークポイントをセーブ
@@ -1057 +1234 @@
         //単独ソースコード
         if(!SetRunning(hChild)) return;
-        sprintf(temporary,"\"%s\" /debug /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
+        sprintf(temporary,"\"%s\" /debug /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
     }
 
@@ -1171 +1348 @@
         //単独ソースコード
         if(!SetRunning(hChild)) return;
-        sprintf(temporary,"\"%s\" /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
+        sprintf(temporary,"\"%s\" /wnd:%08x",MdiInfo[GetWndNum(hChild)]->path.c_str(),m_hWnd);
     }
 
@@ -1226 +1403 @@
         if(!SetRunning(hChild)) return;
 
-        if(IsNeedCompile(MdiInfo[GetWndNum(hChild)].path,0))
+        if(IsNeedCompile(MdiInfo[GetWndNum(hChild)]->path,0))
             SendMessage(WM_COMMAND,IDM_RELEASECOMPILE,0);*/
 
         //単独ソースコード
-        _splitpath(MdiInfo[GetWndNum(hChild)].path.c_str(),temporary,temp2,temp3,NULL);
+        _splitpath(MdiInfo[GetWndNum(hChild)]->path.c_str(),temporary,temp2,temp3,NULL);
         lstrcat(temporary,temp2);
         lstrcat(temporary,temp3);
@@ -1411 +1588 @@
     for(int i=0;i<MdiInfo.size();i++){
         if(i==WndNum) continue;
-        if(MdiInfo[i].hwnd) SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0);
+        if(MdiInfo[i]->hwnd) SendMessage(MdiInfo[i]->hwnd,WM_CLOSE,0,0);
     }
 }
@@ -1421 +1598 @@
 
     //絶対パスをコピー
-    HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE,MdiInfo[WndNum].path.size()+1);
+    HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE,MdiInfo[WndNum]->path.size()+1);
     char *pTemp=(char *)GlobalLock(hGlobal);
-    lstrcpy(pTemp,MdiInfo[WndNum].path.c_str());
+    lstrcpy(pTemp,MdiInfo[WndNum]->path.c_str());
     GlobalUnlock(hGlobal);
 
@@ -1439 +1616 @@
 
     char temporary[1024], temp2[1024];
-    _splitpath(MdiInfo[WndNum].path.c_str(),temporary,temp2,NULL,NULL);
+    _splitpath(MdiInfo[WndNum]->path.c_str(),temporary,temp2,NULL,NULL);
     lstrcat(temporary,temp2);
 
@@ -1451 +1628 @@
 
     char temporary[1024], temp2[1024];
-    _splitpath(MdiInfo[WndNum].path.c_str(),NULL,NULL,temporary,temp2);
+    _splitpath(MdiInfo[WndNum]->path.c_str(),NULL,NULL,temporary,temp2);
     lstrcat(temporary,temp2);
 
@@ -1461 +1638 @@
     fo.hwnd=m_hWnd;
     fo.wFunc=FO_DELETE;
-    fo.pFrom =MdiInfo[WndNum].path.c_str();
+    fo.pFrom =MdiInfo[WndNum]->path.c_str();
     fo.pTo="\0";
     fo.fFlags =FOF_ALLOWUNDO|FOF_NOCONFIRMATION;
@@ -1467 +1644 @@
 
     //閉じる
-    MdiInfo[WndNum].pMdiTextEdit->UnModify();
-    SendMessage(MdiInfo[WndNum].hwnd,WM_CLOSE,0,0);
+    MdiInfo[WndNum]->pMdiTextEdit->UnModify();
+    SendMessage(MdiInfo[WndNum]->hwnd,WM_CLOSE,0,0);
 }
 

trunk/ab5.0/abdev/abdev/src/Program.cpp

@@ -6 +6 @@
 CAppModule Program::_Module;
 
-MainFrame Program::mainFrame;
+MainFrame ActiveBasic::IDE::Program::mainFrame;
 
 #include "../Common.h"

trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp

@@ -279 +279 @@
     while(hChild){
         WndNum=GetWndNum(hChild);
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-            if( MdiInfo[WndNum].pMdiTextEdit->IsModified() ){
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
+            if( MdiInfo[WndNum]->pMdiTextEdit->IsModified() ){
                 for(i=0;i<this->pobj_DBFileInfo->iNum;i++){
                     this->pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
+                    if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0){
                         SaveDocument(hChild,NULL);
                         break;
@@ -290 +290 @@
             }
         }
-        if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
-            if(MdiInfo[WndNum].MdiIconEditInfo->bModify){
+        if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
+            if(MdiInfo[WndNum]->MdiIconEditInfo->bModify){
                 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.iconResources )
                 {
                     lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
+                    if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0){
                         SaveDocument(hChild,NULL);
                         break;
@@ -548 +548 @@
         hChild=GetNextWindow(hChild,GW_HWNDNEXT);
         WndNum=GetWndNum(hCloseChild);
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum]->DocType)){
             for(i=0;i<this->pobj_DBFileInfo->iNum;i++){
                 this->pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0){
 
                     //変更フラグをオフにする
-                    MdiInfo[WndNum].pMdiTextEdit->UnModify();
+                    MdiInfo[WndNum]->pMdiTextEdit->UnModify();
 
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
@@ -561 +561 @@
             }
         }
-        else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD)
+        else if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD)
         {
             BOOST_FOREACH( const WindowInfo *pWindowInfo, windowInfos )
             {
-                if( pWindowInfo->GetName() == MdiInfo[WndNum].path ){
+                if( pWindowInfo->GetName() == MdiInfo[WndNum]->path ){
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;
@@ -571 +571 @@
             }
         }
-        else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
+        else if(MdiInfo[WndNum]->DocType==WNDTYPE_MENU){
             for(i=0;i<this->NumberOfMenu;i++){
-                if( MdiInfo[WndNum].path == this->pMenuInfo[i].IdName )
+                if( MdiInfo[WndNum]->path == this->pMenuInfo[i].IdName )
                 {
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
@@ -580 +580 @@
             }
         }
-        else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
+        else if(MdiInfo[WndNum]->DocType==WNDTYPE_ICONEDIT){
             for(i=0;this->resourceManager.iconResources.size();i++){
                 lstrcpy(temporary,this->resourceManager.iconResources[i].filepath.c_str());
                 lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum]->path.c_str(),temporary)==0){
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;

trunk/ab5.0/abdev/abdev/src/WindowAreaManager.cpp

@@ -3 +3 @@
 using namespace ActiveBasic::IDE;
 
-void WindowAreaManager::AddMdiWindow( WindowComponents::MdiWindow *mdiWindow )
+void WindowAreaManager::AddMdiClientWindow( HWND hMdiClientWnd )
 {
-    this->mdiWindow = mdiWindow;
-    windowCollections.push_back( WindowCollection( mdiWindow ) );
+    windowCollections.push_back( WindowCollection( hMdiClientWnd ) );
 }

trunk/ab5.0/abdev/abdev/src/WindowComponents/MdiWindow.cpp

@@ -1 @@
-#include "stdafx.h"
-
-#include "../../common.h"
-
-using namespace ActiveBasic::IDE::WindowComponents;
-
-LRESULT MdiWindow::OnCreate(LPCREATESTRUCT lpcs){
-    // フレームウィンドウのビューウィンドウを作成
-    CreateMDIClient();
-
-    // メッセージループにメッセージフィルタとアイドルハンドラを追加
-    CMessageLoop* pLoop = Program::_Module.GetMessageLoop();
-    pLoop->AddMessageFilter(this);
-    pLoop->AddIdleHandler(this);
-
-    return 0;
-}

trunk/ab5.0/abdev/res/resource.h

@@ -609 +609 @@
 #define ID_COMMU_FORUM8                 40193
 #define IDM_CODEFORMAT                  40194
+#define ID_40195                        40195
+#define ID_40196                        40196
+#define IDM_CLOSEALLWINDOW              40197
+#define IDM_CLOSE_ALL_WINDOW            40198
 
 // Next default values for new objects
@@ -615 +619 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        311
-#define _APS_NEXT_COMMAND_VALUE         40195
+#define _APS_NEXT_COMMAND_VALUE         40199
 #define _APS_NEXT_CONTROL_VALUE         1497
 #define _APS_NEXT_SYMED_VALUE           101