Changeset 629 in dev for trunk

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.Drag