Changeset 629 in dev for trunk/ab5.0/abdev/abdev/IconEditor_UndoRedo.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/abdev/IconEditor_UndoRedo.cpp (modified) (7 diffs)

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();