Changeset 625 in dev for trunk/ab5.0/abdev/abdev/Rad_UndoRedo.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/Rad_UndoRedo.cpp (modified) (10 diffs)

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

@@ -5 +5 @@
 void Rad_UndoCommand(int WndNum){
     extern HINSTANCE hInst;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     DWORD dw;
-    char *temporary;
     RAD_UNDOSTATE *pUndoState;
 
@@ -47 +45 @@
                 names->name = tempStr;
 
-                GlobalFree(MdiInfo[WndNum].path);
-                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;
-                pWindowInfo->CallBackName=names->CallBackName;
-                names->CallBackName=temporary;
+                MdiInfo[WndNum].path = pWindowInfo->GetName();
             }
             else{
@@ -195 +183 @@
             break;
         case RAD_UNDO_TYPE:
-            dw=pWindowInfo->type;
-            pWindowInfo->type=pUndoState->lpdwData[pUndoState->NowPos];
+            dw=(DWORD)pWindowInfo->GetType();
+            pWindowInfo->SetType( (ActiveBasic::PM::WindowType::EnumType)pUndoState->lpdwData[pUndoState->NowPos] );
             pUndoState->lpdwData[pUndoState->NowPos]=dw;
+
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
@@ -209 +198 @@
 void Rad_RedoCommand(int WndNum){
     extern HINSTANCE hInst;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     DWORD dw;
-    char *temporary;
     RAD_UNDOSTATE *pUndoState;
     ActiveBasic::PM::ChildWindowInfo *pChildInfo;
@@ -247 +234 @@
                 names->name = tempStr;
 
-                GlobalFree(MdiInfo[WndNum].path);
-                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;
-                pWindowInfo->CallBackName=names->CallBackName;
-                names->CallBackName=temporary;
+                MdiInfo[WndNum].path = pWindowInfo->GetName();
             }
             else{
@@ -394 +371 @@
             }
         case RAD_UNDO_TYPE:
-            dw=pWindowInfo->type;
-            pWindowInfo->type=pUndoState->lpdwData[pUndoState->NowPos];
+            dw=(DWORD)pWindowInfo->GetType();
+            pWindowInfo->SetType( (ActiveBasic::PM::WindowType::EnumType)pUndoState->lpdwData[pUndoState->NowPos] );
             pUndoState->lpdwData[pUndoState->NowPos]=dw;
+
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
@@ -411 +389 @@
 void Rad_DeleteUndoData(int WndNum,int pos){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     RAD_UNDOSTATE *pUndoState;
 
@@ -425 +402 @@
             if(pUndoState->SelectItemNum[pos]==SELECT_WINDOW){
                 RAD_UNDOSTATE_NAME *names = (RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pos];
-                HeapDefaultFree(names->CallBackName);
                 delete names;
             }
@@ -471 +447 @@
 void Rad_NoticeChanging(int WndNum,int Command,int SelectItemNum,DWORD dwData){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     RAD_UNDOSTATE *pUndoState;
@@ -510 +485 @@
                 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);
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)SaveNames;
             }