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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/abdev/IconEditor_Tool.cpp (modified) (4 diffs)

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;