Changeset 625 in dev for trunk/ab5.0/abdev/abdev/IconEditor.cpp

Timestamp:

May 27, 2008, 9:17:34 PM (15 years ago)

Author:

dai_9181

Message:

・WindowInfoクラスをリファクタリング
・MdiInfoを単純配列からvectorに変更した。

File:

• trunk/ab5.0/abdev/abdev/IconEditor.cpp (modified) (8 diffs)

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

@@ -29 +29 @@
 }
 void ResetIconType(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     HWND hCombo;
@@ -127 +126 @@
 void AddIconType(int WndNum,int IconType){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,width,BitCount;
 
@@ -192 +190 @@
 }
 void DeleteIconType(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
@@ -241 +238 @@
     extern HANDLE hHeap;
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,IconNum;
     char str[MAX_PATH],str2[32],*buffer;
@@ -257 +253 @@
             i=GetWndNum(hChild);
             if(MdiInfo[i].DocType==WNDTYPE_ICONEDIT){
-                if(lstrcmpi(MdiInfo[i].path,filepath)==0) break;
+                if(lstrcmpi(MdiInfo[i].path.c_str(),filepath)==0) break;
             }
             hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -373 +369 @@
 
     //ウィンドウのID登録
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd==0){
-            MdiInfo[i].hwnd=hChild;
-            MdiInfo[i].DocType=WNDTYPE_ICONEDIT;
-            MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(str)+1);
-            lstrcpy(MdiInfo[i].title,str);
-            if(filepath){
-                MdiInfo[i].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(filepath)+1);
-                lstrcpy(MdiInfo[i].path,filepath);
-            }
-            else MdiInfo[i].path=(char *)GlobalAlloc(GPTR,1);
-
-            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);
-            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);
-            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;
-            break;
-        }
-    }
+    MdiInfo.push_back( MDIINFO() );
+    i = MdiInfo.size()-1;
+    MdiInfo[i].hwnd=hChild;
+    MdiInfo[i].DocType=WNDTYPE_ICONEDIT;
+    MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(str)+1);
+    lstrcpy(MdiInfo[i].title,str);
+    if(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;
+    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);
+    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);
+    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;
+
+
 
     //メモリへ初期描画を行う
@@ -449 +447 @@
 }
 void SaveIconFile(char *filepath,HWND hwnd){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,WndNum;
     char buffer[8192],temporary[MAX_PATH];
@@ -534 +531 @@
 LRESULT CALLBACK MDIClientWindow_IconEdit(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;