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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

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

@@ -41 +41 @@
         case RAD_UNDO_NAME:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                RAD_UNDOSTATE_NAME *names;
-                names=(RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pUndoState->NowPos];
-
-                temporary=pWindowInfo->name;
-                pWindowInfo->name=names->name;
-                names->name=temporary;
+                RAD_UNDOSTATE_NAME *names = (RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pUndoState->NowPos];
+
+                std::string tempStr = pWindowInfo->GetName();
+                pWindowInfo->SetName( names->name );
+                names->name = tempStr;
+
                 GlobalFree(MdiInfo[WndNum].path);
-                MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(pWindowInfo->name)+1);
-                lstrcpy(MdiInfo[WndNum].path,pWindowInfo->name);
-
-                temporary=pWindowInfo->HandleName;
-                pWindowInfo->HandleName=names->HandleName;
-                names->HandleName=temporary;
+                MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,pWindowInfo->GetName().size()+1);
+                lstrcpy(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str());
+
+                tempStr = pWindowInfo->GetHandleName();
+                pWindowInfo->SetHandleName( names->HandleName );
+                names->HandleName = tempStr;
 
                 temporary=pWindowInfo->CallBackName;
@@ -225 +225 @@
         case RAD_UNDO_NAME:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                RAD_UNDOSTATE_NAME *names;
-                names=(RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pUndoState->NowPos];
-
-                temporary=pWindowInfo->name;
-                pWindowInfo->name=names->name;
-                names->name=temporary;
+                RAD_UNDOSTATE_NAME *names = (RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pUndoState->NowPos];
+
+                std::string tempStr = pWindowInfo->GetName();
+                pWindowInfo->SetName( names->name );
+                names->name = tempStr;
+
                 GlobalFree(MdiInfo[WndNum].path);
-                MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(pWindowInfo->name)+1);
-                lstrcpy(MdiInfo[WndNum].path,pWindowInfo->name);
-
-                temporary=pWindowInfo->HandleName;
-                pWindowInfo->HandleName=names->HandleName;
-                names->HandleName=temporary;
+                MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,pWindowInfo->GetName().size()+1);
+                lstrcpy(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str());
+
+                tempStr = pWindowInfo->GetHandleName();
+                pWindowInfo->SetHandleName( names->HandleName );
+                names->HandleName = tempStr;
 
                 temporary=pWindowInfo->CallBackName;
@@ -399 +399 @@
         case RAD_UNDO_NAME:
             if(pUndoState->SelectItemNum[pos]==SELECT_WINDOW){
-                RAD_UNDOSTATE_NAME *names;
-                names=(RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pos];
-                HeapDefaultFree(names->name);
-                HeapDefaultFree(names->HandleName);
+                RAD_UNDOSTATE_NAME *names = (RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pos];
                 HeapDefaultFree(names->CallBackName);
-                HeapDefaultFree(names);
+                delete names;
             }
             else HeapDefaultFree((void *)pUndoState->lpdwData[pos]);
@@ -477 +474 @@
         case RAD_UNDO_NAME:
             if(SelectItemNum==SELECT_WINDOW){
-                RAD_UNDOSTATE_NAME *names,*SaveNames;
-                names=(RAD_UNDOSTATE_NAME *)dwData;
-                SaveNames=(RAD_UNDOSTATE_NAME *)HeapAlloc(hHeap,0,sizeof(RAD_UNDOSTATE_NAME));
-                SaveNames->name=(char *)HeapAlloc(hHeap,0,lstrlen(names->name)+1);
-                lstrcpy(SaveNames->name,names->name);
-                SaveNames->HandleName=(char *)HeapAlloc(hHeap,0,lstrlen(names->HandleName)+1);
-                lstrcpy(SaveNames->HandleName,names->HandleName);
+                RAD_UNDOSTATE_NAME *names = (RAD_UNDOSTATE_NAME *)dwData;
+                RAD_UNDOSTATE_NAME *SaveNames = new RAD_UNDOSTATE_NAME();
+                SaveNames->name = names->name;
+                SaveNames->HandleName = names->HandleName;
                 SaveNames->CallBackName=(char *)HeapAlloc(hHeap,0,lstrlen(names->CallBackName)+1);
                 lstrcpy(SaveNames->CallBackName,names->CallBackName);