Changeset 626 in dev for trunk/ab5.0/abdev/abdev/FileOperation.cpp

Timestamp:

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

Author:

dai_9181

Message:

MdiInfoをリファクタリング

File:

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

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

@@ -344 +344 @@
 
     char szOldTitle[MAX_PATH];
-    lstrcpy(szOldTitle,MdiInfo[WndNum].title);
+    lstrcpy(szOldTitle,MdiInfo[WndNum].title.c_str());
 
     if(MdiInfo[WndNum].DocType==WNDTYPE_RAD||MdiInfo[WndNum].DocType==WNDTYPE_MENU){
@@ -376 +376 @@
 
             //ドキュメント セレクト コンボボックスから消去
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title);
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title.c_str());
             SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
 
@@ -385 +385 @@
             _splitpath(temporary,NULL,NULL,str,str2);
             lstrcat(str,str2);
-            GlobalFree(MdiInfo[WndNum].title);
-            MdiInfo[WndNum].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(str)+1);
-            lstrcpy(MdiInfo[WndNum].title,str);
-            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum].title);
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title);
+            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);
+            SetWindowText(hChild,MdiInfo[WndNum].title.c_str());
         }
         else{
@@ -474 +472 @@
             CloseHandle(fh);
             MdiInfo[WndNum].path = temporary;
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title);
+            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);
-            lstrcpy(MdiInfo[WndNum].title,str);
-            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum].title);
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title);
+            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);
+            SetWindowText(hChild,MdiInfo[WndNum].title.c_str());
         }
         else{
@@ -504 +502 @@
         color=pobj_MainTab->GetItemColor(szOldTitle);
         pobj_MainTab->DeleteItem( szOldTitle, false );
-        pobj_MainTab->InsertItem( MdiInfo[WndNum].title, false, color );
+        pobj_MainTab->InsertItem( MdiInfo[WndNum].title.c_str(), false, color );
     }
     else{
-        pobj_MainTab->RenameItem( szOldTitle, MdiInfo[WndNum].title );
+        pobj_MainTab->RenameItem( szOldTitle, MdiInfo[WndNum].title.c_str() );
     }