Changeset 617 in dev for trunk/ab5.0/abdev/abdev/ProjectControl.cpp

Timestamp:

May 19, 2008, 4:31:37 PM (16 years ago)

Author:

dai_9181

Message:

WindowInfoクラスをリファクタリング。

File:

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

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

@@ -250 +250 @@
 
                             //"%s ウィンドウをプロジェクトから削除します。よろしいですか？"
-                            sprintf(str,STRING_PJ_CHECK_DELETEWINDOW,ProjectInfo.windowInfos[i]->name);
+                            sprintf(str,STRING_PJ_CHECK_DELETEWINDOW,ProjectInfo.windowInfos[i]->GetName().c_str());
                             if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break;
 
@@ -1055 +1055 @@
         WindowInfos windowInfos;
         windowInfos.push_back( new WindowInfo() );
-        windowInfos.back()->name="MainWnd";
-        windowInfos.back()->HandleName="hMainWnd";
+        windowInfos.back()->SetName( "MainWnd" );
+        windowInfos.back()->SetHandleName( "hMainWnd" );
         windowInfos.back()->pos.x=CW_USEDEFAULT;
         windowInfos.back()->pos.y=CW_USEDEFAULT;
@@ -1080 +1080 @@
         ProjectInfo.NumberOfMenu=0;
         SaveWindowFile( temporary, windowInfos );
+
+        windowInfos.Clear();
     }
 
@@ -1207 +1209 @@
         tv.item.iImage=2;
         tv.item.iSelectedImage=2;
-        tv.item.pszText = pWindowInfo->name;
+        char temporary[1024];
+        lstrcpy( temporary, pWindowInfo->GetName().c_str() );
+        tv.item.pszText = temporary;
         pWindowInfo->hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
     }
@@ -1581 +1585 @@
                         else if(lstrcmpi(temporary,"rad")==0){
                             for(i3=0;i3<static_cast<int>(ProjectInfo.windowInfos.size());i3++){
-                                if(lstrcmpi(ProjectInfo.windowInfos[i3]->name,temp2)==0){
+                                if(lstrcmpi(ProjectInfo.windowInfos[i3]->GetName().c_str(),temp2)==0){
                                     NewRadWindow( *ProjectInfo.windowInfos[i3] );
                                     break;
@@ -1703 +1707 @@
                         else if(lstrcmpi(temporary,"rad")==0){
                             for(i3=0;i3<static_cast<int>(ProjectInfo.windowInfos.size());i3++){
-                                if(lstrcmpi(ProjectInfo.windowInfos[i3]->name,temp2)==0){
+                                if(lstrcmpi(ProjectInfo.windowInfos[i3]->GetName().c_str(),temp2)==0){
                                     NewRadWindow( *ProjectInfo.windowInfos[i3] );
                                     break;
@@ -1896 +1900 @@
             BOOST_FOREACH( const WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
             {
-                if(lstrcmp(MdiInfo[WndNum].path, pWindowInfo->name)==0){
+                if( pWindowInfo->GetName() == MdiInfo[WndNum].path ){
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;
@@ -1931 +1935 @@
     BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        HeapDefaultFree(pWindowInfo->name);
-        HeapDefaultFree(pWindowInfo->HandleName);
         HeapDefaultFree(pWindowInfo->caption);
         HeapDefaultFree(pWindowInfo->ClassName);
@@ -2043 +2045 @@
             BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
             {
-                if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->name)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str())==0){
                     sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum].path);
                     i2+=lstrlen(buffer+i2);