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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

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

@@ -99 +99 @@
     int i;
     if(!IsWindow(hChild)) return -1;
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(hChild==MdiInfo[i].hwnd) break;
     }
-    if(i==MAX_WNDNUM) i=-1;
+    if(i==MdiInfo.size()) i=-1;
     return i;
 }
@@ -119 +119 @@
         projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
 
-        if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) return i;
+        if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) return i;
     }
     return -1;
@@ -643 +643 @@
     }
     WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-        pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_ENABLED);
-
-        pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_ENABLED);
-
-        pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_ENABLED);
-    }
-    else{
-        pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_GRAYED);
-
-        pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_GRAYED);
-
-        pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_GRAYED);
+    if( WndNum != -1 )
+    {
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+            pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_ENABLED);
+
+            pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_ENABLED);
+
+            pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_ENABLED);
+        }
+        else{
+            pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_GRAYED);
+
+            pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_GRAYED);
+
+            pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_GRAYED);
+        }
     }
 }
@@ -722 +725 @@
 void DuplicateTitleCheck(char *lpszTitle){
     int i;
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(MdiInfo[i].hwnd){
             if(lstrcmpi(MdiInfo[i].title,lpszTitle)==0){
@@ -747 +750 @@
             i=GetWndNum(hChild);
             if(IS_DOCUMENT_TEXT(MdiInfo[i].DocType)){
-                if(lstrcmpi(MdiInfo[i].path,filepath)==0) break;
+                if(lstrcmpi(MdiInfo[i].path.c_str(),filepath)==0) break;
             }
             hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -890 +893 @@
         hChild,NULL,hInst,NULL);
 
+
     //ウィンドウのID登録
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd==0){
-            MdiInfo[i].hwnd=hChild;
-            MdiInfo[i].DocType=DocumentType;
-            DuplicateTitleCheck(str);
-            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].pMdiTextEdit = new CMdiTextEdit( &MdiInfo[i] );
-
-            MdiInfo[i].pMdiTextEdit->hEdit=hEdit;
-            MdiInfo[i].pMdiTextEdit->pobj_WebResult=new CWebResult(hChild);
-            MdiInfo[i].pMdiTextEdit->pobj_Ruler=new CRuler(hChild,i);
-            MdiInfo[i].pMdiTextEdit->hIcon=shfi.hIcon;
-            MdiInfo[i].pMdiTextEdit->buffer=buffer;
-            MdiInfo[i].pMdiTextEdit->pColorRef=(COLORREF *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(COLORREF)*lstrlen(buffer));
-            MdiInfo[i].pMdiTextEdit->iUnderStart=-1;
-            MdiInfo[i].pMdiTextEdit->iUnderEnd=-1;
-            MdiInfo[i].pMdiTextEdit->StartCaretPos.x=0;
-            MdiInfo[i].pMdiTextEdit->StartCaretPos.y=0;
-            MdiInfo[i].pMdiTextEdit->EndCaretPos.x=0;
-            MdiInfo[i].pMdiTextEdit->EndCaretPos.y=0;
-            MdiInfo[i].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
-            MdiInfo[i].pMdiTextEdit->bAutoScroll=0;
-            MdiInfo[i].pMdiTextEdit->iWidth_ControlTabSpace=
-                GetControlTabSpace(i,&MdiInfo[i].pMdiTextEdit->iLineNumberTextCount);
-            MdiInfo[i].pMdiTextEdit->iCharCode=iCharCode;
-            MdiInfo[i].pMdiTextEdit->iLfCode=iLfCode;
-
-            MdiInfo[i].IndentStr=0;
-
-            int flag;
-            if(mdic.style&WS_MAXIMIZE) flag=SIZE_MAXIMIZED;
-            else flag=0;
-            SendTextEditResizeEvent(hChild);
-            break;
-        }
-    }
+    MdiInfo.push_back( MDIINFO() );
+    i = MdiInfo.size()-1;
+    MdiInfo[i].hwnd=hChild;
+    MdiInfo[i].DocType=DocumentType;
+    MdiInfo[i].title="";
+    DuplicateTitleCheck(str);
+    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].pMdiTextEdit = new CMdiTextEdit( &MdiInfo[i] );
+
+    MdiInfo[i].pMdiTextEdit->hEdit=hEdit;
+    MdiInfo[i].pMdiTextEdit->pobj_WebResult=new CWebResult(hChild);
+    MdiInfo[i].pMdiTextEdit->pobj_Ruler=new CRuler(hChild,i);
+    MdiInfo[i].pMdiTextEdit->hIcon=shfi.hIcon;
+    MdiInfo[i].pMdiTextEdit->buffer=buffer;
+    MdiInfo[i].pMdiTextEdit->pColorRef=(COLORREF *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(COLORREF)*lstrlen(buffer));
+    MdiInfo[i].pMdiTextEdit->iUnderStart=-1;
+    MdiInfo[i].pMdiTextEdit->iUnderEnd=-1;
+    MdiInfo[i].pMdiTextEdit->StartCaretPos.x=0;
+    MdiInfo[i].pMdiTextEdit->StartCaretPos.y=0;
+    MdiInfo[i].pMdiTextEdit->EndCaretPos.x=0;
+    MdiInfo[i].pMdiTextEdit->EndCaretPos.y=0;
+    MdiInfo[i].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+    MdiInfo[i].pMdiTextEdit->bAutoScroll=0;
+    MdiInfo[i].pMdiTextEdit->iWidth_ControlTabSpace=
+        GetControlTabSpace(i,&MdiInfo[i].pMdiTextEdit->iLineNumberTextCount);
+    MdiInfo[i].pMdiTextEdit->iCharCode=iCharCode;
+    MdiInfo[i].pMdiTextEdit->iLfCode=iLfCode;
+    MdiInfo[i].IndentStr=0;
+
+
+    int flag;
+    if(mdic.style&WS_MAXIMIZE) flag=SIZE_MAXIMIZED;
+    else flag=0;
+    SendTextEditResizeEvent(hChild);
+
 
     //ワードカラーをセット
-    if(IS_DOCUMENT_TEXT(DocumentType)) SetTextEditWordColor(i);
+    if(IS_DOCUMENT_TEXT(DocumentType)) SetTextEditWordColor(MdiInfo.size()-1);
 
     //Docコンボボックスに追加
@@ -983 +987 @@
 
     GlobalFree(MdiInfo[WndNum].title);
-    GlobalFree(MdiInfo[WndNum].path);
 
     if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
@@ -1063 +1066 @@
         HeapDefaultFree(MdiInfo[WndNum].MdiIconEditInfo);
     }
+    else
+    {
+        throw;
+    }
+
+    Jenga::Common::EraseVectorItem<std::vector<MDIINFO>>( MdiInfo, WndNum );
 }
 void ResizeTextEditWnd(HWND hwnd,int cx,int cy){
@@ -1711 +1720 @@
         if(!TranslateAccelerator(hOwner,hAccel,&msg)){
             if( projectInfo.IsOpened() ){
-                for(i=0,i2=0;i<MAX_WNDNUM;i++){
+                for(i=0,i2=0;i<MdiInfo.size();i++){
                     if(MdiInfo[i].hwnd&&MdiInfo[i].DocType==WNDTYPE_RAD){
                         if(IsDialogMessage(MdiInfo[i].MdiRadInfo->hProp_Dlg,&msg)) i2=1;