Changeset 615 in dev for trunk/ab5.0/abdev

Timestamp:

May 19, 2008, 7:38:03 AM (17 years ago)

Author:

dai_9181

Message:

WindowInfosクラスを追加。

Location:

trunk/ab5.0/abdev/abdev

Files:

• Common.h (modified) (6 diffs)
• DrawWindow.cpp (modified) (2 diffs)
• MessageCallOperation.cpp (modified) (6 diffs)
• ProjectControl.cpp (modified) (10 diffs)
• RadProc.cpp (modified) (16 diffs)
• RadSupport.cpp (modified) (3 diffs)
• RadToolsAndPropertyProc.cpp (modified) (63 diffs)
• Rad_UndoRedo.cpp (modified) (2 diffs)
• WindowControl.cpp (modified) (42 diffs)
• abdev.cpp (modified) (1 diff)
• abdev.vcproj (modified) (3 diffs)
• include/ProjectManager (added)
• include/ProjectManager/ProjectManager.h (moved) (moved from trunk/ab5.0/abdev/abdev/include/ProjectManager.h ) (1 diff)
• include/ProjectManager/WindowManager.h (added)
• src/MainFrame.cpp (modified) (2 diffs)
• src/ProjectManager (added)
• src/ProjectManager/ProjectManager.cpp (added)
• stdafx.h (modified) (1 diff)

trunk/ab5.0/abdev/abdev/Common.h

@@ -504 +504 @@
 #define WNDTYPE_MODELESSDLG 3
 
-//イメージタイプ
-#define IMGTYPE_FILE    0
-#define IMGTYPE_RES     1
-
-struct IMAGECTRLINFO{
-    int type;
-    char *path;
-};
-struct CHILDINFO{
-    char *IdName;
-    POINT pos;
-    SIZE size;
-    char *caption;
-    DWORD style;
-    DWORD ExStyle;
-    int Control;
-
-    IMAGECTRLINFO ImageCtrlInfo;
-};
-struct WINDOW_INFO{
-    //ウィンドウデータ
-    char *name;
-    char *HandleName;
-    POINT pos;
-    SIZE size;
-    char *caption;
-    DWORD style;
-    DWORD ExStyle;
-    char *MenuID;
-    int id;
-    int bgColor;
-    LOGFONT LogFont;
-    char *IconResName;
-    char *ClassName;
-    char *CallBackName;
-    long type;
-    char *filepath;
-
-    //子ウィンドウ管理
-    int NumberOfChildWindows;
-    CHILDINFO *pChildInfo;
-
-    //ツリー項目
-    HTREEITEM hTreeItem;
-};
 struct NEWPROJECTINFO{
     char name[MAX_PATH];
@@ -1033 +988 @@
 //WindowControl.cpp
 int GetWndInfoNum(char *name);
-WINDOW_INFO *GetWndInfo( char *name );
+WindowInfo *GetWndInfo( char *name );
 HGLOBAL Rad_GetChildInfoClipboardData(int WndNum,int WndInfoNum);
 void Rad_PasteChildInfoClipboardData(int WndNum,HGLOBAL hGlobal);
@@ -1039 +994 @@
 void GetItemClassName(char *buffer,int Control);
 void SaveWindowProgram();
-void SaveWindowFile( char *path, const std::vector<WINDOW_INFO> &windowInfos );
+void SaveWindowFile( char *path, const WindowInfos &windowInfos );
 _int8 OpenWindowFile(char *path);
 void GetDefaultWindowFont(LOGFONT *LogFont);
@@ -1064 +1019 @@
 
 //RadProc.cpp
-void NewRadWindow( const WINDOW_INFO &windowInfo );
+void NewRadWindow( const WindowInfo &windowInfo );
 int InsertDlgItem(int WndNum,int WndInfoNum,int ItemNum,POINT *pPos,SIZE *pSize,char *IdName,char *caption,DWORD style_or_WndNum,DWORD ExStyle,int Control,int ImageType,char *ImagePath,DWORD dwInsertType);
 void DeleteDlgItem(int WndNum,int WndInfoNum,int ItemNum,BOOL bNoticeChanging);
@@ -1076 +1031 @@
 
 //DrawWindow.cpp
-void DrawRadWindow(int WndNum,const WINDOW_INFO *pWindowInfo);
+void DrawRadWindow(int WndNum,const WindowInfo *pWindowInfo);
 
 //Rad_UndoRedo.cpp
@@ -1112 +1067 @@
 //RadSupport.cpp
 LRESULT CALLBACK TestWindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);
-void SetSupportDlgData(int WndNum, const WINDOW_INFO &windowInfo );
+void SetSupportDlgData(int WndNum, const WindowInfo &windowInfo );
 BOOL CALLBACK DlgRadSupport(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);
 

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

@@ -687 +687 @@
     DeleteObject(hBmp);
 }
-void DesigningWindow(int WndNum,HDC hdc,POINT *pBasePos,const WINDOW_INFO *pWindowInfo){
+void DesigningWindow(int WndNum,HDC hdc,POINT *pBasePos,const WindowInfo *pWindowInfo){
     extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,i4;
@@ -1748 +1748 @@
     DeleteObject(hFont);
 }
-void DrawRadWindow(int WndNum,const WINDOW_INFO *pWindowInfo){
+void DrawRadWindow(int WndNum,const WindowInfo *pWindowInfo){
     extern MDIINFO MdiInfo[MAX_WNDNUM];
     HBRUSH hOldBrush;

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

@@ -20 +20 @@
     if(lstrcmp(EventName,"MenuClick")==0) return CT_MENU;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
     for(i=0;i<pWindowInfo->NumberOfChildWindows;i++){
         if(lstrcmp(buffer,pWindowInfo->pChildInfo[i].IdName)==0) break;
@@ -33 +33 @@
     char *buffer,**ppNames,temporary[MAX_PATH],temp2[MAX_PATH];
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     NameLen=lstrlen(pWindowInfo->name);
@@ -133 +133 @@
     POINT pos;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     sprintf(temporary,"%s%s",ProjectInfo.dir,pWindowInfo->filepath);
@@ -219 +219 @@
     char temporary[MAX_PATH];
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     MaxCount=ListView_GetItemCount(hList);
@@ -402 +402 @@
 
     WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-    WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
     i=0;
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
@@ -646 +646 @@
             {
                 WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
                 NowMenuNum=GetMenuInfoNum(pWindowInfo->MenuID);
             }

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

@@ -180 +180 @@
                     hTreeItem=TreeView_GetSelection(hMaterialTreeView);
                     for(i=0;i<static_cast<int>(ProjectInfo.windowInfos.size());i++){
-                        if(ProjectInfo.windowInfos[i].hTreeItem==hTreeItem){
-                            NewRadWindow( ProjectInfo.windowInfos[i] );
+                        if(ProjectInfo.windowInfos[i]->hTreeItem==hTreeItem){
+                            NewRadWindow( *ProjectInfo.windowInfos[i] );
                             break;
                         }
@@ -247 +247 @@
                     }
                     for(i=0;i<static_cast<int>(ProjectInfo.windowInfos.size());i++){
-                        if(ProjectInfo.windowInfos[i].hTreeItem==hTreeItem){
+                        if(ProjectInfo.windowInfos[i]->hTreeItem==hTreeItem){
 
                             //"%s ウィンドウをプロジェクトから削除します。よろしいですか？"
-                            sprintf(str,STRING_PJ_CHECK_DELETEWINDOW,ProjectInfo.windowInfos[i].name);
+                            sprintf(str,STRING_PJ_CHECK_DELETEWINDOW,ProjectInfo.windowInfos[i]->name);
                             if(IDCANCEL==MessageBox(hOwner,str,APPLICATION_NAME,MB_OKCANCEL|MB_ICONEXCLAMATION)) break;
 
@@ -1053 +1053 @@
         // ウィンドウ定義ファイル（*.wnd）を作成
         /////////////////////////////////////////
-        std::vector<WINDOW_INFO> windowInfos;
-        windowInfos.push_back( WINDOW_INFO() );
-        windowInfos.back().name="MainWnd";
-        windowInfos.back().HandleName="hMainWnd";
-        windowInfos.back().pos.x=CW_USEDEFAULT;
-        windowInfos.back().pos.y=CW_USEDEFAULT;
-        windowInfos.back().size.cx=480;
-        windowInfos.back().size.cy=360;
-        windowInfos.back().caption=NewProjectInfo.name;
+        WindowInfos windowInfos;
+        windowInfos.push_back( new WindowInfo() );
+        windowInfos.back()->name="MainWnd";
+        windowInfos.back()->HandleName="hMainWnd";
+        windowInfos.back()->pos.x=CW_USEDEFAULT;
+        windowInfos.back()->pos.y=CW_USEDEFAULT;
+        windowInfos.back()->size.cx=480;
+        windowInfos.back()->size.cy=360;
+        windowInfos.back()->caption=NewProjectInfo.name;
         if(NewProjectInfo.dwTypeID==IDC_EXE_WINDOWBASE)
-            windowInfos.back().style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_VISIBLE;
+            windowInfos.back()->style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_VISIBLE;
         else if(NewProjectInfo.dwTypeID==IDC_EXE_DIRECTX)
-            windowInfos.back().style=WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU;
-        windowInfos.back().ExStyle=0;
-        windowInfos.back().MenuID=0;
-        windowInfos.back().id=0;
-        windowInfos.back().bgColor=COLOR_3DFACE;
-        GetDefaultWindowFont(&windowInfos.back().LogFont);
-        windowInfos.back().IconResName=0;
-        windowInfos.back().ClassName="NORMAL";
-        windowInfos.back().CallBackName="MainWndProc";
-        windowInfos.back().type=WNDTYPE_DEFAULT;
-        windowInfos.back().filepath="MainWnd.ab";
-        windowInfos.back().NumberOfChildWindows=0;
+            windowInfos.back()->style=WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU;
+        windowInfos.back()->ExStyle=0;
+        windowInfos.back()->MenuID=0;
+        windowInfos.back()->id=0;
+        windowInfos.back()->bgColor=COLOR_3DFACE;
+        GetDefaultWindowFont(&windowInfos.back()->LogFont);
+        windowInfos.back()->IconResName=0;
+        windowInfos.back()->ClassName="NORMAL";
+        windowInfos.back()->CallBackName="MainWndProc";
+        windowInfos.back()->type=WNDTYPE_DEFAULT;
+        windowInfos.back()->filepath="MainWnd.ab";
+        windowInfos.back()->NumberOfChildWindows=0;
         sprintf(temporary,"%s%s.wnd",dir,NewProjectInfo.name);
 
@@ -1204 +1204 @@
     tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv);
     ProjectInfo.hWindowTreeItem=tv.hParent;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
         tv.item.iImage=2;
         tv.item.iSelectedImage=2;
-        tv.item.pszText = windowInfo.name;
-        windowInfo.hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
+        tv.item.pszText = pWindowInfo->name;
+        pWindowInfo->hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
     }
 }
@@ -1457 +1457 @@
     }
     else{
-        ProjectInfo.windowInfos.clear();
+        ProjectInfo.windowInfos.Clear();
 
         ProjectInfo.NumberOfMenu=0;
@@ -1582 +1582 @@
                         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){
-                                    NewRadWindow( ProjectInfo.windowInfos[i3] );
+                                if(lstrcmpi(ProjectInfo.windowInfos[i3]->name,temp2)==0){
+                                    NewRadWindow( *ProjectInfo.windowInfos[i3] );
                                     break;
                                 }
@@ -1704 +1704 @@
                         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){
-                                    NewRadWindow( ProjectInfo.windowInfos[i3] );
+                                if(lstrcmpi(ProjectInfo.windowInfos[i3]->name,temp2)==0){
+                                    NewRadWindow( *ProjectInfo.windowInfos[i3] );
                                     break;
                                 }
@@ -1895 +1895 @@
         }
         else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-            BOOST_FOREACH( const WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+            BOOST_FOREACH( const WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
             {
-                if(lstrcmp(MdiInfo[WndNum].path, windowInfo.name)==0){
+                if(lstrcmp(MdiInfo[WndNum].path, pWindowInfo->name)==0){
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;
@@ -1930 +1930 @@
 
     //ウィンドウ情報のメモリを解放
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        HeapDefaultFree(windowInfo.name);
-        HeapDefaultFree(windowInfo.HandleName);
-        HeapDefaultFree(windowInfo.caption);
-        HeapDefaultFree(windowInfo.ClassName);
-        HeapDefaultFree(windowInfo.CallBackName);
-        HeapDefaultFree(windowInfo.filepath);
-        if(windowInfo.MenuID)
-            HeapDefaultFree(windowInfo.MenuID);
-        if(windowInfo.IconResName)
-            HeapDefaultFree(windowInfo.IconResName);
+        HeapDefaultFree(pWindowInfo->name);
+        HeapDefaultFree(pWindowInfo->HandleName);
+        HeapDefaultFree(pWindowInfo->caption);
+        HeapDefaultFree(pWindowInfo->ClassName);
+        HeapDefaultFree(pWindowInfo->CallBackName);
+        HeapDefaultFree(pWindowInfo->filepath);
+        if(pWindowInfo->MenuID)
+            HeapDefaultFree(pWindowInfo->MenuID);
+        if(pWindowInfo->IconResName)
+            HeapDefaultFree(pWindowInfo->IconResName);
 
         //子ウィンドウのメモリを解放
-        for(i2=0;i2<windowInfo.NumberOfChildWindows;i2++){
-            HeapDefaultFree(windowInfo.pChildInfo[i2].IdName);
-            HeapDefaultFree(windowInfo.pChildInfo[i2].caption);
-            if(windowInfo.pChildInfo[i2].Control==CT_IMAGEBOX){
+        for(i2=0;i2<pWindowInfo->NumberOfChildWindows;i2++){
+            HeapDefaultFree(pWindowInfo->pChildInfo[i2].IdName);
+            HeapDefaultFree(pWindowInfo->pChildInfo[i2].caption);
+            if(pWindowInfo->pChildInfo[i2].Control==CT_IMAGEBOX){
                 //イメージ ボックスの場合
-                HeapDefaultFree(windowInfo.pChildInfo[i2].ImageCtrlInfo.path);
-            }
-        }
-        HeapDefaultFree(windowInfo.pChildInfo);
-    }
-    ProjectInfo.windowInfos.clear();
+                HeapDefaultFree(pWindowInfo->pChildInfo[i2].ImageCtrlInfo.path);
+            }
+        }
+        HeapDefaultFree(pWindowInfo->pChildInfo);
+    }
+    ProjectInfo.windowInfos.Clear();
 
     //メニュー情報のメモリを解放
@@ -2040 +2040 @@
         }
         else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-            BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+            BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
             {
-                if(lstrcmpi(MdiInfo[WndNum].path,windowInfo.name)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->name)==0){
                     sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum].path);
                     i2+=lstrlen(buffer+i2);

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

@@ -4 +4 @@
 #include "common.h"
 
-void NewRadWindow( const WINDOW_INFO &windowInfo )
+void NewRadWindow( const WindowInfo &windowInfo )
 {
     extern HINSTANCE hInst,hResInst;
@@ -165 +165 @@
     CHILDINFO *pChildInfo;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
-
-    pWindowInfo->pChildInfo=(CHILDINFO *)HeapReAlloc(hHeap,0,pWindowInfo->pChildInfo,(pWindowInfo->NumberOfChildWindows+1)*sizeof(WINDOW_INFO));
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
+
+    pWindowInfo->pChildInfo=(CHILDINFO *)HeapReAlloc(hHeap,0,pWindowInfo->pChildInfo,(pWindowInfo->NumberOfChildWindows+1)*sizeof(WindowInfo));
     if(ItemNum==-1)
         NewItemNum=pWindowInfo->NumberOfChildWindows;
@@ -264 +264 @@
     int i;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     //変更情報
@@ -347 +347 @@
     RECT rect;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     hdc=GetDC(hwnd);
@@ -449 +449 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]==SELECT_WINDOW){
@@ -546 +546 @@
     SCROLLINFO ScrollInfo;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg);
@@ -607 +607 @@
     int i;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     for(i=pWindowInfo->NumberOfChildWindows-1;i>=0;i--){
@@ -669 +669 @@
 
     //サポートダイアログの内容をセット
-    SetSupportDlgData( WndNum, ProjectInfo.windowInfos[WndInfoNum] );
+    SetSupportDlgData( WndNum, *ProjectInfo.windowInfos[WndInfoNum] );
 }
 void SetItemNumOnFrame(int WndNum,int WndInfoNum,RECT *pRect){
@@ -676 +676 @@
     RECT rect;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]=-1;
@@ -701 +701 @@
     RECT rect;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1){
@@ -762 +762 @@
     SIZE NeedSize;
 
-    WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
 
     //必要な幅、高さを共に100ピクセル余裕を持たせる
@@ -817 +817 @@
                 i=GetWndNum(GetParent(hwnd));
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -897 +897 @@
                 i=GetWndNum(hParent);
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -1275 +1275 @@
                 i=GetWndNum(hParent);
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -1440 +1440 @@
                 i=GetWndNum(hParent);
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
@@ -1467 +1467 @@
                 hParent=GetParent(hwnd);
                 i=GetWndNum(hParent);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){

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

@@ -50 +50 @@
     }
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     if(pWindowInfo->style&WS_CHILD){
@@ -171 +171 @@
 }
 
-void SetSupportDlgData(int WndNum, const WINDOW_INFO &windowInfo )
+void SetSupportDlgData(int WndNum, const WindowInfo &windowInfo )
 {
     ////////////////////////////////////
@@ -302 +302 @@
 
             i=GetWndNum(GetParent(hwnd));
-            WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+            WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
             for(i3=0;;i3++){

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

@@ -360 +360 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 sprintf(temporary,"h%s",pWindowInfo->name);
                 sprintf(temp2,"%sProc",pWindowInfo->name);
@@ -394 +394 @@
 
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         RAD_UNDOSTATE_NAME names,NoticeNames;
@@ -484 +484 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(pWindowInfo->ExStyle&WS_EX_TOPMOST) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOPMOST,BM_SETCHECK,BST_CHECKED,0);
                 if(pWindowInfo->ExStyle&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
@@ -523 +523 @@
                             style|=WS_EX_CONTROLPARENT;
 
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         if(style==pWindowInfo->ExStyle){
@@ -556 +556 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->name);
@@ -704 +704 @@
                         if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,(DLGPROC)DlgRadProperty_Window_Rename)) return 1;
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                         SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->name);
                         SetDlgItemText(hwnd,IDC_HANDLE,pWindowInfo->HandleName);
@@ -713 +713 @@
                         if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1;
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                         SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->caption);
                         return 1;
@@ -720 +720 @@
                     {
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                         LOGFONT lf;
                         lf=pWindowInfo->LogFont;
@@ -735 +735 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         i3=SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_GETCURSEL,0,0);
@@ -811 +811 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -831 +831 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -852 +852 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -869 +869 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -890 +890 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -907 +907 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -923 +923 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -939 +939 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -955 +955 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -971 +971 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -986 +986 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1001 +1001 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1017 +1017 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1033 +1033 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1049 +1049 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1065 +1065 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1090 +1090 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1122 +1122 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
                     SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->caption);
@@ -1134 +1134 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_CAPTION))+1;
@@ -1253 +1253 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
             }
@@ -1262 +1262 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_IDNAME))+1;
@@ -1302 +1302 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     switch(LOWORD(wParam)){
@@ -1374 +1374 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].ExStyle&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
                 if(pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].ExStyle&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);
@@ -1387 +1387 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         DWORD style;
@@ -1437 +1437 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -1508 +1508 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[i2];
+                WindowInfo *pWindowInfo = ProjectInfo.windowInfos[i2];
 
                 //共通スタイル
@@ -1659 +1659 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -1735 +1735 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[i2];
+                WindowInfo *pWindowInfo = ProjectInfo.windowInfos[i2];
 
                 //共通スタイル
@@ -1950 +1950 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -2017 +2017 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[i2];
+                WindowInfo *pWindowInfo = ProjectInfo.windowInfos[i2];
 
                 //共通スタイル
@@ -2214 +2214 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -2271 +2271 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -2495 +2495 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -2543 +2543 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -2648 +2648 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -2759 +2759 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3029 +3029 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -3111 +3111 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3321 +3321 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -3391 +3391 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3575 +3575 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -3601 +3601 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3660 +3660 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -3732 +3732 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3894 +3894 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -3933 +3933 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3979 +3979 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -4024 +4024 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -4110 +4110 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -4166 +4166 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -4263 +4263 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -4298 +4298 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -4475 +4475 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].IdName);
@@ -4533 +4533 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル

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

@@ -20 +20 @@
     pUndoState->NowPos=i;
 
-    WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
     int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum].path);
     switch(pUndoState->Command[pUndoState->NowPos]){
@@ -206 +206 @@
     }
 
-    WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
     int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum].path);
     switch(pUndoState->Command[pUndoState->NowPos]){

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

@@ -15 +15 @@
 int GetWndInfoNum(char *name){
     for( int i=0;i<static_cast<int>(ProjectInfo.windowInfos.size());i++){
-        if(lstrcmpi(name,ProjectInfo.windowInfos[i].name)==0) return i;
+        if(lstrcmpi(name,ProjectInfo.windowInfos[i]->name)==0) return i;
     }
     return -1;
 }
-WINDOW_INFO *GetWndInfo( char *name )
+WindowInfo *GetWndInfo( char *name )
 {
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        if(lstrcmpi(name,windowInfo.name)==0) return &windowInfo;
+        if(lstrcmpi(name,pWindowInfo->name)==0) return pWindowInfo;
     }
     return NULL;
@@ -86 +86 @@
 
     for(i3--;i3>=0;i3--){
-        pChildInfo=&ProjectInfo.windowInfos[WndInfoNum].pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]];
+        pChildInfo=&ProjectInfo.windowInfos[WndInfoNum]->pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]];
 
         MemSize+=lstrlen(pChildInfo->IdName)+1+
@@ -352 +352 @@
     return 1;
 }
-BOOL GetNotifyCommandByItemMessage(WINDOW_INFO *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
+BOOL GetNotifyCommandByItemMessage(WindowInfo *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
     int i,i2,i3,sw;
     char temporary[MAX_PATH];
@@ -429 +429 @@
     }
 }
-void GetCommandByItemMessage(WINDOW_INFO *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
+void GetCommandByItemMessage(WindowInfo *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
     extern HANDLE hHeap;
     int i,i2,i3;
@@ -523 +523 @@
     char temporary[MAX_PATH],*temp2;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     Command[0]=0;
@@ -1003 +1003 @@
     i4=1000;
     i5=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        for(i3=0;i3<windowInfo.NumberOfChildWindows;i3++){
+        for(i3=0;i3<pWindowInfo->NumberOfChildWindows;i3++){
 
             //重複チェック
             for(i6=0,sw1=0;i6<i5;i6++){
-                if(lstrcmpi(ppNames[i6],windowInfo.pChildInfo[i3].IdName)==0){
+                if(lstrcmpi(ppNames[i6],pWindowInfo->pChildInfo[i3].IdName)==0){
                     sw1=1;
                     break;
@@ -1017 +1017 @@
 
             ppNames=(char **)HeapReAlloc(hHeap,0,ppNames,sizeof(char *)*(i5+1));
-            ppNames[i5]=windowInfo.pChildInfo[i3].IdName;
+            ppNames[i5]=pWindowInfo->pChildInfo[i3].IdName;
             i5++;
 
-            sprintf(buffer+i2,"Const %s=%d\r\n",windowInfo.pChildInfo[i3].IdName,i4);
+            sprintf(buffer+i2,"Const %s=%d\r\n",pWindowInfo->pChildInfo[i3].IdName,i4);
             i2+=lstrlen(buffer+i2);
             i4++;
@@ -1040 +1040 @@
 
     //ハンドル変数を定義
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        sprintf(buffer+i2,"Dim %s As HWND\r\n",windowInfo.HandleName);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"Dim hFont_%s As HFONT\r\n",windowInfo.name);
+        sprintf(buffer+i2,"Dim %s As HWND\r\n",pWindowInfo->HandleName);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"Dim hFont_%s As HFONT\r\n",pWindowInfo->name);
         i2+=lstrlen(buffer+i2);
         sprintf(buffer+i2,"hFont_%s=CreateFont(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,\"%s\")\r\n",
-            windowInfo.name,
-            windowInfo.LogFont.lfHeight,
-            windowInfo.LogFont.lfWidth,
-            windowInfo.LogFont.lfEscapement,
-            windowInfo.LogFont.lfOrientation,
-            windowInfo.LogFont.lfWeight,
-            windowInfo.LogFont.lfItalic,
-            windowInfo.LogFont.lfUnderline,
-            windowInfo.LogFont.lfStrikeOut,
-            windowInfo.LogFont.lfCharSet,
-            windowInfo.LogFont.lfOutPrecision,
-            windowInfo.LogFont.lfClipPrecision,
-            windowInfo.LogFont.lfQuality,
-            windowInfo.LogFont.lfPitchAndFamily,
-            windowInfo.LogFont.lfFaceName);
+            pWindowInfo->name,
+            pWindowInfo->LogFont.lfHeight,
+            pWindowInfo->LogFont.lfWidth,
+            pWindowInfo->LogFont.lfEscapement,
+            pWindowInfo->LogFont.lfOrientation,
+            pWindowInfo->LogFont.lfWeight,
+            pWindowInfo->LogFont.lfItalic,
+            pWindowInfo->LogFont.lfUnderline,
+            pWindowInfo->LogFont.lfStrikeOut,
+            pWindowInfo->LogFont.lfCharSet,
+            pWindowInfo->LogFont.lfOutPrecision,
+            pWindowInfo->LogFont.lfClipPrecision,
+            pWindowInfo->LogFont.lfQuality,
+            pWindowInfo->LogFont.lfPitchAndFamily,
+            pWindowInfo->LogFont.lfFaceName);
         i2+=lstrlen(buffer+i2);
 
@@ -1076 +1076 @@
     i2+=lstrlen(buffer+i2);
     i=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        if(windowInfo.bgColor<=0&&
-            windowInfo.bgColor!=-(int)RGB(255,255,255)&&
-            windowInfo.bgColor!=-(int)RGB(0,0,0)){
+        if(pWindowInfo->bgColor<=0&&
+            pWindowInfo->bgColor!=-(int)RGB(255,255,255)&&
+            pWindowInfo->bgColor!=-(int)RGB(0,0,0)){
                 sprintf(buffer+i2,"Dim _RadSys_hBackBrush%d As HBRUSH\r\n",i);
                 i2+=lstrlen(buffer+i2);
-                sprintf(buffer+i2,"_RadSys_hBackBrush%d=CreateSolidBrush(%d)\r\n",i,-windowInfo.bgColor);
+                sprintf(buffer+i2,"_RadSys_hBackBrush%d=CreateSolidBrush(%d)\r\n",i,-pWindowInfo->bgColor);
                 i2+=lstrlen(buffer+i2);
         }
-        if(windowInfo.bgColor>=0x1000){
+        if(pWindowInfo->bgColor>=0x1000){
                 sprintf(buffer+i2,"Dim _RadSys_hBackBrush%d As HBRUSH\r\n",i);
                 i2+=lstrlen(buffer+i2);
                 sprintf(buffer+i2,"_RadSys_hBackBrush%d=CreatePatternBrush(LoadImage(GetModuleHandle(0),%s,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE or LR_SHARED))\r\n",
                     i,
-                    ProjectInfo.res.pBitmapResInfo[windowInfo.bgColor-0x1000].IdName);
+                    ProjectInfo.res.pBitmapResInfo[pWindowInfo->bgColor-0x1000].IdName);
                 i2+=lstrlen(buffer+i2);
         }
@@ -1102 +1102 @@
 
     //イメージ ボックス用の変数を定義
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        for(i3=0;i3<windowInfo.NumberOfChildWindows;i3++){
-            if(windowInfo.pChildInfo[i3].Control==CT_IMAGEBOX){
-                if((windowInfo.pChildInfo[i3].style&0x000F)==SS_ICON||
-                    (windowInfo.pChildInfo[i3].style&0x000F)==SS_BITMAP){
-                    sprintf(buffer+i2,"Dim hImage_%s_%s As HANDLE\r\n",windowInfo.name,windowInfo.pChildInfo[i3].IdName);
+        for(i3=0;i3<pWindowInfo->NumberOfChildWindows;i3++){
+            if(pWindowInfo->pChildInfo[i3].Control==CT_IMAGEBOX){
+                if((pWindowInfo->pChildInfo[i3].style&0x000F)==SS_ICON||
+                    (pWindowInfo->pChildInfo[i3].style&0x000F)==SS_BITMAP){
+                    sprintf(buffer+i2,"Dim hImage_%s_%s As HANDLE\r\n",pWindowInfo->name,pWindowInfo->pChildInfo[i3].IdName);
                     i2+=lstrlen(buffer+i2);
 
@@ -1156 +1156 @@
     }
 
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
         //フォントハンドル解放
-        sprintf(buffer+i2,"\tDeleteObject(hFont_%s)\r\n",windowInfo.name);
+        sprintf(buffer+i2,"\tDeleteObject(hFont_%s)\r\n",pWindowInfo->name);
         i2+=lstrlen(buffer+i2);
 
@@ -1172 +1172 @@
     i2+=lstrlen(buffer+i2);
     i=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        if(windowInfo.bgColor<=0&&
-            windowInfo.bgColor!=-(int)RGB(255,255,255)&&
-            windowInfo.bgColor!=-(int)RGB(0,0,0)){
+        if(pWindowInfo->bgColor<=0&&
+            pWindowInfo->bgColor!=-(int)RGB(255,255,255)&&
+            pWindowInfo->bgColor!=-(int)RGB(0,0,0)){
                 sprintf(buffer+i2,"\tDeleteObject(_RadSys_hBackBrush%d)\r\n",i);
                 i2+=lstrlen(buffer+i2);
@@ -1191 +1191 @@
 
     i=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
         if(i!=0){
@@ -1205 +1205 @@
         ppNames=GetProcedureNamesOfMessageCall(i,&pItemEventInfo,&i3,&bAvailUserProc[i]);
 
-        sprintf(buffer+i2,"Function EventCall_%s(hWnd As HWND, message As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT\r\n",windowInfo.name);
+        sprintf(buffer+i2,"Function EventCall_%s(hWnd As HWND, message As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT\r\n",pWindowInfo->name);
         i2+=lstrlen(buffer+i2);
 
@@ -1243 +1243 @@
             i2+=lstrlen(buffer+i2);
             if(sw4){
-                sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",windowInfo.name);
+                sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",pWindowInfo->name);
                 i2+=lstrlen(buffer+i2);
             }
@@ -1253 +1253 @@
             i2+=lstrlen(buffer+i2);
 
-            if(GetNotifyCommandByItemMessage(&windowInfo,pItemEventInfo,buffer+i2,"\t\t\t\t")){
+            if(GetNotifyCommandByItemMessage(pWindowInfo,pItemEventInfo,buffer+i2,"\t\t\t\t")){
                 i2+=lstrlen(buffer+i2);
 
@@ -1269 +1269 @@
             lstrcpy(buffer+i2,"\t\tCase WM_NOTIFY\r\n");
             i2+=lstrlen(buffer+i2);
-            sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",windowInfo.name);
+            sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",pWindowInfo->name);
             i2+=lstrlen(buffer+i2);
         }
@@ -1281 +1281 @@
 
             //pItemEventInfoのIdName、EventNameメンバのメモリ解放はこの関数内で行う
-            GetCommandByItemMessage(&windowInfo,pItemEventInfo,buffer+i2,"\t\t\t\t");
+            GetCommandByItemMessage(pWindowInfo,pItemEventInfo,buffer+i2,"\t\t\t\t");
             i2+=lstrlen(buffer+i2);
 
@@ -1292 +1292 @@
         lstrcpy(buffer+i2,"\t\tCase Else\r\n");
         i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"\t\t\tEventCall_%s=DefWindowProc(hWnd,message,wParam,lParam)\r\n",windowInfo.name);
+        sprintf(buffer+i2,"\t\t\tEventCall_%s=DefWindowProc(hWnd,message,wParam,lParam)\r\n",pWindowInfo->name);
         i2+=lstrlen(buffer+i2);
         lstrcpy(buffer+i2,"\t\t\tExit Function\r\n");
@@ -1300 +1300 @@
         i2+=lstrlen(buffer+i2);
 
-        sprintf(buffer+i2,"\tEventCall_%s=0\r\n",windowInfo.name);
+        sprintf(buffer+i2,"\tEventCall_%s=0\r\n",pWindowInfo->name);
         i2+=lstrlen(buffer+i2);
         lstrcpy(buffer+i2,"End Function\r\n");
@@ -1356 +1356 @@
     sw1=0;
     i=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        if(windowInfo.type==WNDTYPE_MODALDLG){
+        if(pWindowInfo->type==WNDTYPE_MODALDLG){
             if(sw1==0){
-                sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",windowInfo.name);
+                sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->name);
                 i2+=lstrlen(buffer+i2);
                 sw1=1;
             }
             else{
-                sprintf(buffer+i2,"\tElseIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",windowInfo.name);
+                sprintf(buffer+i2,"\tElseIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->name);
                 i2+=lstrlen(buffer+i2);
             }
             sprintf(buffer+i2,"\t\t%s=CreateWindowEx(&H%08x,\"NORMALDLG\",\"%s\",&H%08x,%d,%d,%d,%d,hOwnerWnd,%d As HMENU,GetModuleHandle(0),0)\r\n",
-                windowInfo.HandleName,
-                windowInfo.ExStyle,
-                windowInfo.caption,
-                windowInfo.style,
-                windowInfo.pos.x,
-                windowInfo.pos.y,
-                windowInfo.size.cx,
-                windowInfo.size.cy,
-                windowInfo.id);
+                pWindowInfo->HandleName,
+                pWindowInfo->ExStyle,
+                pWindowInfo->caption,
+                pWindowInfo->style,
+                pWindowInfo->pos.x,
+                pWindowInfo->pos.y,
+                pWindowInfo->size.cx,
+                pWindowInfo->size.cy,
+                pWindowInfo->id);
             i2+=lstrlen(buffer+i2);
             sprintf(buffer+i2,"\t\thDlg=%s\r\n",
-                windowInfo.HandleName);
+                pWindowInfo->HandleName);
             i2+=lstrlen(buffer+i2);
             if(bAvailUserProc[i]){
                 sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(%s) As LONG_PTR)\r\n",
-                    windowInfo.HandleName,
-                    windowInfo.CallBackName);
+                    pWindowInfo->HandleName,
+                    pWindowInfo->CallBackName);
             }
             else{
                 sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(EventCall_%s) As LONG_PTR)\r\n",
-                    windowInfo.HandleName,
-                    windowInfo.name);
-            }
-            i2+=lstrlen(buffer+i2);
-            sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",windowInfo.HandleName);
-            i2+=lstrlen(buffer+i2);
-            if(windowInfo.IconResName){
-                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",windowInfo.HandleName,windowInfo.IconResName);
+                    pWindowInfo->HandleName,
+                    pWindowInfo->name);
+            }
+            i2+=lstrlen(buffer+i2);
+            sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->HandleName);
+            i2+=lstrlen(buffer+i2);
+            if(pWindowInfo->IconResName){
+                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->HandleName,pWindowInfo->IconResName);
                 i2+=lstrlen(buffer+i2);
             }
-            sprintf(buffer+i2,"\t\tShowWindow(%s,SW_SHOW)\r\n",windowInfo.HandleName);
+            sprintf(buffer+i2,"\t\tShowWindow(%s,SW_SHOW)\r\n",pWindowInfo->HandleName);
             i2+=lstrlen(buffer+i2);
         }
@@ -1455 +1455 @@
     i2+=lstrlen(buffer+i2);
     i=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        if(windowInfo.type==WNDTYPE_MODELESSDLG){
-            sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",windowInfo.name);
+        if(pWindowInfo->type==WNDTYPE_MODELESSDLG){
+            sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->name);
             i2+=lstrlen(buffer+i2);
 
             sprintf(buffer+i2,"\t\t%s=CreateWindowEx(&H%08x,\"NORMALDLG\",\"%s\",&H%08x,%d,%d,%d,%d,hOwnerWnd,%d As HMENU,GetModuleHandle(0),0)\r\n",
-                windowInfo.HandleName,
-                windowInfo.ExStyle,
-                windowInfo.caption,
-                windowInfo.style,
-                windowInfo.pos.x,
-                windowInfo.pos.y,
-                windowInfo.size.cx,
-                windowInfo.size.cy,
-                windowInfo.id);
-            i2+=lstrlen(buffer+i2);
-            sprintf(buffer+i2,"\t\tCreateDialog=%s\r\n",windowInfo.HandleName);
+                pWindowInfo->HandleName,
+                pWindowInfo->ExStyle,
+                pWindowInfo->caption,
+                pWindowInfo->style,
+                pWindowInfo->pos.x,
+                pWindowInfo->pos.y,
+                pWindowInfo->size.cx,
+                pWindowInfo->size.cy,
+                pWindowInfo->id);
+            i2+=lstrlen(buffer+i2);
+            sprintf(buffer+i2,"\t\tCreateDialog=%s\r\n",pWindowInfo->HandleName);
             i2+=lstrlen(buffer+i2);
             if(bAvailUserProc[i]){
                 sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(%s) As LONG_PTR)\r\n",
-                    windowInfo.HandleName,
-                    windowInfo.CallBackName);
+                    pWindowInfo->HandleName,
+                    pWindowInfo->CallBackName);
             }
             else{
                 sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(EventCall_%s) As LONG_PTR)\r\n",
-                    windowInfo.HandleName,
-                    windowInfo.name);
-            }
-            i2+=lstrlen(buffer+i2);
-            sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",windowInfo.HandleName);
-            i2+=lstrlen(buffer+i2);
-            if(windowInfo.IconResName){
-                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",windowInfo.HandleName,windowInfo.IconResName);
+                    pWindowInfo->HandleName,
+                    pWindowInfo->name);
+            }
+            i2+=lstrlen(buffer+i2);
+            sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->HandleName);
+            i2+=lstrlen(buffer+i2);
+            if(pWindowInfo->IconResName){
+                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->HandleName,pWindowInfo->IconResName);
                 i2+=lstrlen(buffer+i2);
             }
-            sprintf(buffer+i2,"\tEnd If\r\n",windowInfo.name);
+            sprintf(buffer+i2,"\tEnd If\r\n",pWindowInfo->name);
             i2+=lstrlen(buffer+i2);
         }
@@ -1528 +1528 @@
 
     i=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        if(windowInfo.type==WNDTYPE_DEFAULT){
+        if(pWindowInfo->type==WNDTYPE_DEFAULT){
             //////////////////////
             //通常ウィンドウ作成
@@ -1537 +1537 @@
             i2+=2;
 
-            if(windowInfo.IconResName==0){
+            if(pWindowInfo->IconResName==0){
                 lstrcpy(buffer+i2,"_RadSys_wcl.hIcon=LoadIcon(NULL,MAKEINTRESOURCE(IDI_APPLICATION))\r\n");
                 i2+=lstrlen(buffer+i2);
@@ -1544 +1544 @@
             }
             else{
-                sprintf(buffer+i2,"_RadSys_wcl.hIcon=LoadIcon(_RadSys_wcl.hInstance,MAKEINTRESOURCE(%s))\r\n",windowInfo.IconResName);
+                sprintf(buffer+i2,"_RadSys_wcl.hIcon=LoadIcon(_RadSys_wcl.hInstance,MAKEINTRESOURCE(%s))\r\n",pWindowInfo->IconResName);
                 i2+=lstrlen(buffer+i2);
-                sprintf(buffer+i2,"_RadSys_wcl.hIconSm=LoadIcon(_RadSys_wcl.hInstance,MAKEINTRESOURCE(%s))\r\n",windowInfo.IconResName);
+                sprintf(buffer+i2,"_RadSys_wcl.hIconSm=LoadIcon(_RadSys_wcl.hInstance,MAKEINTRESOURCE(%s))\r\n",pWindowInfo->IconResName);
                 i2+=lstrlen(buffer+i2);
             }
@@ -1553 +1553 @@
             i2+=lstrlen(buffer+i2);
             if(bAvailUserProc[i])
-                sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(%s)\r\n",windowInfo.CallBackName);
-            else sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(EventCall_%s)\r\n",windowInfo.name);
-            i2+=lstrlen(buffer+i2);
-            if(windowInfo.bgColor==COLOR_3DFACE)
+                sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(%s)\r\n",pWindowInfo->CallBackName);
+            else sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(EventCall_%s)\r\n",pWindowInfo->name);
+            i2+=lstrlen(buffer+i2);
+            if(pWindowInfo->bgColor==COLOR_3DFACE)
                 lstrcpy(buffer+i2,"_RadSys_wcl.hbrBackground=h3DFaceBrush\r\n");
-            else if(windowInfo.bgColor==-(int)RGB(255,255,255))
+            else if(pWindowInfo->bgColor==-(int)RGB(255,255,255))
                 lstrcpy(buffer+i2,"_RadSys_wcl.hbrBackground=GetStockObject(WHITE_BRUSH)\r\n");
-            else if(windowInfo.bgColor==-(int)RGB(0,0,0))
+            else if(pWindowInfo->bgColor==-(int)RGB(0,0,0))
                 lstrcpy(buffer+i2,"_RadSys_wcl.hbrBackground=GetStockObject(BLACK_BRUSH)\r\n");
-            else if(windowInfo.bgColor<=0||
-                windowInfo.bgColor>=0x1000){
+            else if(pWindowInfo->bgColor<=0||
+                pWindowInfo->bgColor>=0x1000){
                 //色指定またはビットマップ
                 sprintf(buffer+i2,"_RadSys_wcl.hbrBackground=_RadSys_hBackBrush%d\r\n",i);
@@ -1571 +1571 @@
             i2+=lstrlen(buffer+i2);
             sprintf(buffer+i2,"CreateWindowEx(&H%08x,\"%s%d\",\"%s\",&H%08x,%d,%d,%d,%d,0,0,GetModuleHandle(0),0)\r\n",
-                windowInfo.ExStyle,
-                windowInfo.ClassName,i,
-                windowInfo.caption,
-                windowInfo.style,
-                windowInfo.pos.x,
-                windowInfo.pos.y,
-                windowInfo.size.cx,
-                windowInfo.size.cy);
+                pWindowInfo->ExStyle,
+                pWindowInfo->ClassName,i,
+                pWindowInfo->caption,
+                pWindowInfo->style,
+                pWindowInfo->pos.x,
+                pWindowInfo->pos.y,
+                pWindowInfo->size.cx,
+                pWindowInfo->size.cy);
             i2+=lstrlen(buffer+i2);
         }
@@ -1623 +1623 @@
     return i2;
 }
-void SaveWindowFile( char *path, const std::vector<WINDOW_INFO> &windowInfos )
+void SaveWindowFile( char *path, const WindowInfos &windowInfos )
 {
     extern HANDLE hHeap;
@@ -1633 +1633 @@
     buffer=(char *)HeapAlloc(hHeap,0,GENERAL_SIZE*size);
     i2=0;
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        sprintf(buffer+i2,"WINDOW:%s\r\n",windowInfo.name);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    HANDLE    = %s\r\n",windowInfo.HandleName);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    POINT     = %d,%d\r\n",windowInfo.pos.x,windowInfo.pos.y);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    SIZE      = %d,%d\r\n",windowInfo.size.cx,windowInfo.size.cy);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    CAPTION   = \"%s\"\r\n",windowInfo.caption);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    STYLE     = &H%08x\r\n",windowInfo.style);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    EXSTYLE   = &H%08x\r\n",windowInfo.ExStyle);
-        i2+=lstrlen(buffer+i2);
-        if(windowInfo.MenuID){
-            sprintf(buffer+i2,"    MENUID    = %s\r\n",windowInfo.MenuID);
-            i2+=lstrlen(buffer+i2);
-        }
-        sprintf(buffer+i2,"    ID        = %d\r\n",windowInfo.id);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    BGCOLOR   = %d\r\n",windowInfo.bgColor);
+        sprintf(buffer+i2,"WINDOW:%s\r\n",pWindowInfo->name);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    HANDLE    = %s\r\n",pWindowInfo->HandleName);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    POINT     = %d,%d\r\n",pWindowInfo->pos.x,pWindowInfo->pos.y);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    SIZE      = %d,%d\r\n",pWindowInfo->size.cx,pWindowInfo->size.cy);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    CAPTION   = \"%s\"\r\n",pWindowInfo->caption);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    STYLE     = &H%08x\r\n",pWindowInfo->style);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    EXSTYLE   = &H%08x\r\n",pWindowInfo->ExStyle);
+        i2+=lstrlen(buffer+i2);
+        if(pWindowInfo->MenuID){
+            sprintf(buffer+i2,"    MENUID    = %s\r\n",pWindowInfo->MenuID);
+            i2+=lstrlen(buffer+i2);
+        }
+        sprintf(buffer+i2,"    ID        = %d\r\n",pWindowInfo->id);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    BGCOLOR   = %d\r\n",pWindowInfo->bgColor);
         i2+=lstrlen(buffer+i2);
         sprintf(buffer+i2,"    FONT      = %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,\"%s\"\r\n",
-            windowInfo.LogFont.lfHeight,
-            windowInfo.LogFont.lfWidth,
-            windowInfo.LogFont.lfEscapement,
-            windowInfo.LogFont.lfOrientation,
-            windowInfo.LogFont.lfWeight,
-            windowInfo.LogFont.lfItalic,
-            windowInfo.LogFont.lfUnderline,
-            windowInfo.LogFont.lfStrikeOut,
-            windowInfo.LogFont.lfCharSet,
-            windowInfo.LogFont.lfOutPrecision,
-            windowInfo.LogFont.lfClipPrecision,
-            windowInfo.LogFont.lfQuality,
-            windowInfo.LogFont.lfPitchAndFamily,
-            windowInfo.LogFont.lfFaceName);
-        i2+=lstrlen(buffer+i2);
-        if(windowInfo.IconResName){
-            sprintf(buffer+i2,"    ICONID    = %s\r\n",windowInfo.IconResName);
-            i2+=lstrlen(buffer+i2);
-        }
-        sprintf(buffer+i2,"    CLASS     = \"%s\"\r\n",windowInfo.ClassName);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    CALLBACK  = %s\r\n",windowInfo.CallBackName);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    TYPE      = %d\r\n",windowInfo.type);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    FILEPATH  = %s\r\n",windowInfo.filepath);
-        i2+=lstrlen(buffer+i2);
-        for(i3=0;i3<windowInfo.NumberOfChildWindows;i3++){
-            temporary=SetCaptionSequence(windowInfo.pChildInfo[i3].caption);
+            pWindowInfo->LogFont.lfHeight,
+            pWindowInfo->LogFont.lfWidth,
+            pWindowInfo->LogFont.lfEscapement,
+            pWindowInfo->LogFont.lfOrientation,
+            pWindowInfo->LogFont.lfWeight,
+            pWindowInfo->LogFont.lfItalic,
+            pWindowInfo->LogFont.lfUnderline,
+            pWindowInfo->LogFont.lfStrikeOut,
+            pWindowInfo->LogFont.lfCharSet,
+            pWindowInfo->LogFont.lfOutPrecision,
+            pWindowInfo->LogFont.lfClipPrecision,
+            pWindowInfo->LogFont.lfQuality,
+            pWindowInfo->LogFont.lfPitchAndFamily,
+            pWindowInfo->LogFont.lfFaceName);
+        i2+=lstrlen(buffer+i2);
+        if(pWindowInfo->IconResName){
+            sprintf(buffer+i2,"    ICONID    = %s\r\n",pWindowInfo->IconResName);
+            i2+=lstrlen(buffer+i2);
+        }
+        sprintf(buffer+i2,"    CLASS     = \"%s\"\r\n",pWindowInfo->ClassName);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    CALLBACK  = %s\r\n",pWindowInfo->CallBackName);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    TYPE      = %d\r\n",pWindowInfo->type);
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    FILEPATH  = %s\r\n",pWindowInfo->filepath);
+        i2+=lstrlen(buffer+i2);
+        for(i3=0;i3<pWindowInfo->NumberOfChildWindows;i3++){
+            temporary=SetCaptionSequence(pWindowInfo->pChildInfo[i3].caption);
             sprintf(buffer+i2,"    ITEM      = %s,%d,%d,%d,%d,\"%s\",&H%08x,&H%08x,%d",
-                windowInfo.pChildInfo[i3].IdName,
-                windowInfo.pChildInfo[i3].pos.x,windowInfo.pChildInfo[i3].pos.y,
-                windowInfo.pChildInfo[i3].size.cx,windowInfo.pChildInfo[i3].size.cy,
+                pWindowInfo->pChildInfo[i3].IdName,
+                pWindowInfo->pChildInfo[i3].pos.x,pWindowInfo->pChildInfo[i3].pos.y,
+                pWindowInfo->pChildInfo[i3].size.cx,pWindowInfo->pChildInfo[i3].size.cy,
                 temporary,
-                windowInfo.pChildInfo[i3].style,
-                windowInfo.pChildInfo[i3].ExStyle,
-                windowInfo.pChildInfo[i3].Control
+                pWindowInfo->pChildInfo[i3].style,
+                pWindowInfo->pChildInfo[i3].ExStyle,
+                pWindowInfo->pChildInfo[i3].Control
             );
             i2+=lstrlen(buffer+i2);
             HeapDefaultFree(temporary);
-            if(windowInfo.pChildInfo[i3].Control==CT_IMAGEBOX){
-                sprintf(buffer+i2,",%d,\"%s\"",windowInfo.pChildInfo[i3].ImageCtrlInfo.type,windowInfo.pChildInfo[i3].ImageCtrlInfo.path);
+            if(pWindowInfo->pChildInfo[i3].Control==CT_IMAGEBOX){
+                sprintf(buffer+i2,",%d,\"%s\"",pWindowInfo->pChildInfo[i3].ImageCtrlInfo.type,pWindowInfo->pChildInfo[i3].ImageCtrlInfo.path);
                 i2+=lstrlen(buffer+i2);
             }
@@ -1709 +1709 @@
             }
         }
-        sprintf(buffer+i2,"END\r\n",windowInfo.name);
+        sprintf(buffer+i2,"END\r\n",pWindowInfo->name);
         i2+=lstrlen(buffer+i2);
         if(i2-GENERAL_SIZE<GENERAL_SIZE){
@@ -1720 +1720 @@
         i2+=lstrlen(buffer+i2);
         i2+=GetSaveMenuData(buffer+i2,1,ProjectInfo.pMenuInfo[i].pMenuInfo,ProjectInfo.pMenuInfo[i].NumberOfMenu);
-        sprintf(buffer+i2,"END\r\n",windowInfos[i].name);
+        sprintf(buffer+i2,"END\r\n",windowInfos[i]->name);
         i2+=lstrlen(buffer+i2);
         if(i2-GENERAL_SIZE<GENERAL_SIZE){
@@ -1841 +1841 @@
     ProjectInfo.pMenuInfo=(MENU_INFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
 
-    ProjectInfo.windowInfos.clear();
+    ProjectInfo.windowInfos.Clear();
 
     for(i=0,i3=0;;i++){
@@ -1876 +1876 @@
             //ウィンドウ
             if(lstrcmpi(temporary,"WINDOW")==0&&i3==0){
-                ProjectInfo.windowInfos.push_back( WINDOW_INFO() );
+                ProjectInfo.windowInfos.push_back( new WindowInfo() );
                 i3=1;
 
-                ProjectInfo.windowInfos.back().name=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(ProjectInfo.windowInfos.back().name,temp2);
-
-                ProjectInfo.windowInfos.back().NumberOfChildWindows=0;
-                ProjectInfo.windowInfos.back().pChildInfo=(CHILDINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
+                ProjectInfo.windowInfos.back()->name=(char *)HeapAlloc(hHeap,0,i2+1);
+                lstrcpy(ProjectInfo.windowInfos.back()->name,temp2);
+
+                ProjectInfo.windowInfos.back()->NumberOfChildWindows=0;
+                ProjectInfo.windowInfos.back()->pChildInfo=(CHILDINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
             }
             else if(lstrcmpi(temporary,"HANDLE")==0&&i3==1){
-                ProjectInfo.windowInfos.back().HandleName=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(ProjectInfo.windowInfos.back().HandleName,temp2);
+                ProjectInfo.windowInfos.back()->HandleName=(char *)HeapAlloc(hHeap,0,i2+1);
+                lstrcpy(ProjectInfo.windowInfos.back()->HandleName,temp2);
             }
             else if(lstrcmpi(temporary,"POINT")==0&&i3==1){
                 sscanf(temp2,"%d,%d",
-                    &ProjectInfo.windowInfos.back().pos.x,
-                    &ProjectInfo.windowInfos.back().pos.y);
-                if(ProjectInfo.windowInfos.back().pos.x==-1) ProjectInfo.windowInfos.back().pos.x=CW_USEDEFAULT;
-                if(ProjectInfo.windowInfos.back().pos.y==-1) ProjectInfo.windowInfos.back().pos.y=CW_USEDEFAULT;
+                    &ProjectInfo.windowInfos.back()->pos.x,
+                    &ProjectInfo.windowInfos.back()->pos.y);
+                if(ProjectInfo.windowInfos.back()->pos.x==-1) ProjectInfo.windowInfos.back()->pos.x=CW_USEDEFAULT;
+                if(ProjectInfo.windowInfos.back()->pos.y==-1) ProjectInfo.windowInfos.back()->pos.y=CW_USEDEFAULT;
             }
             else if(lstrcmpi(temporary,"SIZE")==0&&i3==1){
                 sscanf(temp2,"%d,%d",
-                    &ProjectInfo.windowInfos.back().size.cx,
-                    &ProjectInfo.windowInfos.back().size.cy);
+                    &ProjectInfo.windowInfos.back()->size.cx,
+                    &ProjectInfo.windowInfos.back()->size.cy);
             }
             else if(lstrcmpi(temporary,"CAPTION")==0&&i3==1){
                 if(temp2[0]=='\"'&&temp2[lstrlen(temp2)-1]=='\"'){
                     temp2[lstrlen(temp2)-1]=0;
-                    ProjectInfo.windowInfos.back().caption=(char *)HeapAlloc(hHeap,0,i2+1);
-                    lstrcpy(ProjectInfo.windowInfos.back().caption,temp2+1);
+                    ProjectInfo.windowInfos.back()->caption=(char *)HeapAlloc(hHeap,0,i2+1);
+                    lstrcpy(ProjectInfo.windowInfos.back()->caption,temp2+1);
                 }
             }
-            else if(lstrcmpi(temporary,"STYLE")==0&&i3==1) ProjectInfo.windowInfos.back().style=GetValue(temp2);
-            else if(lstrcmpi(temporary,"EXSTYLE")==0&&i3==1) ProjectInfo.windowInfos.back().ExStyle=GetValue(temp2);
+            else if(lstrcmpi(temporary,"STYLE")==0&&i3==1) ProjectInfo.windowInfos.back()->style=GetValue(temp2);
+            else if(lstrcmpi(temporary,"EXSTYLE")==0&&i3==1) ProjectInfo.windowInfos.back()->ExStyle=GetValue(temp2);
             else if(lstrcmpi(temporary,"MENUID")==0&&i3==1){
-                ProjectInfo.windowInfos.back().MenuID=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(ProjectInfo.windowInfos.back().MenuID,temp2);
-            }
-            else if(lstrcmpi(temporary,"ID")==0&&i3==1) ProjectInfo.windowInfos.back().id=GetValue(temp2);
+                ProjectInfo.windowInfos.back()->MenuID=(char *)HeapAlloc(hHeap,0,i2+1);
+                lstrcpy(ProjectInfo.windowInfos.back()->MenuID,temp2);
+            }
+            else if(lstrcmpi(temporary,"ID")==0&&i3==1) ProjectInfo.windowInfos.back()->id=GetValue(temp2);
             else if(lstrcmpi(temporary,"BGCOLOR")==0&&i3==1){
-                ProjectInfo.windowInfos.back().bgColor=GetValue(temp2);
+                ProjectInfo.windowInfos.back()->bgColor=GetValue(temp2);
                 if(ProjectInfo.dwVersion<=3){
                     //プロジェクトバージョンが3以前のときは新値に変換する
-                    if(ProjectInfo.windowInfos.back().bgColor==-1)
-                        ProjectInfo.windowInfos.back().bgColor=-(int)RGB(255,255,255);
+                    if(ProjectInfo.windowInfos.back()->bgColor==-1)
+                        ProjectInfo.windowInfos.back()->bgColor=-(int)RGB(255,255,255);
                 }
             }
             else if(lstrcmpi(temporary,"FONT")==0&&i3==1){
                 i5=GetOneParameter(temp2,0,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfHeight=GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfHeight=GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfWidth=GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfWidth=GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfEscapement=GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfEscapement=GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfOrientation=GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfOrientation=GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfWeight=GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfWeight=GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfItalic=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfItalic=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfUnderline=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfUnderline=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfStrikeOut=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfStrikeOut=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfCharSet=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfCharSet=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfOutPrecision=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfOutPrecision=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfClipPrecision=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfClipPrecision=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfQuality=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfQuality=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
-                ProjectInfo.windowInfos.back().LogFont.lfPitchAndFamily=(BYTE)GetValue(temp3);
+                ProjectInfo.windowInfos.back()->LogFont.lfPitchAndFamily=(BYTE)GetValue(temp3);
 
                 i5=GetOneParameter(temp2,i5,temp3);
                 RemoveStringQuotes(temp3);
-                lstrcpy(ProjectInfo.windowInfos.back().LogFont.lfFaceName,temp3);
+                lstrcpy(ProjectInfo.windowInfos.back()->LogFont.lfFaceName,temp3);
             }
             else if(lstrcmpi(temporary,"ICONID")==0&&i3==1){
-                ProjectInfo.windowInfos.back().IconResName=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(ProjectInfo.windowInfos.back().IconResName,temp2);
+                ProjectInfo.windowInfos.back()->IconResName=(char *)HeapAlloc(hHeap,0,i2+1);
+                lstrcpy(ProjectInfo.windowInfos.back()->IconResName,temp2);
             }
             else if(lstrcmpi(temporary,"CLASS")==0&&i3==1){
                 if(temp2[0]=='\"'&&temp2[lstrlen(temp2)-1]=='\"'){
                     temp2[lstrlen(temp2)-1]=0;
-                    ProjectInfo.windowInfos.back().ClassName=(char *)HeapAlloc(hHeap,0,i2+1);
-                    lstrcpy(ProjectInfo.windowInfos.back().ClassName,temp2+1);
+                    ProjectInfo.windowInfos.back()->ClassName=(char *)HeapAlloc(hHeap,0,i2+1);
+                    lstrcpy(ProjectInfo.windowInfos.back()->ClassName,temp2+1);
                 }
             }
             else if(lstrcmpi(temporary,"CALLBACK")==0&&i3==1){
-                ProjectInfo.windowInfos.back().CallBackName=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(ProjectInfo.windowInfos.back().CallBackName,temp2);
+                ProjectInfo.windowInfos.back()->CallBackName=(char *)HeapAlloc(hHeap,0,i2+1);
+                lstrcpy(ProjectInfo.windowInfos.back()->CallBackName,temp2);
             }
 
             //以前のバージョンとの互換用
-            else if(lstrcmpi(temporary,"DLGTMP")==0&&i3==1) ProjectInfo.windowInfos.back().type=GetValue(temp2);
-
-            else if(lstrcmpi(temporary,"TYPE")==0&&i3==1) ProjectInfo.windowInfos.back().type=GetValue(temp2);
+            else if(lstrcmpi(temporary,"DLGTMP")==0&&i3==1) ProjectInfo.windowInfos.back()->type=GetValue(temp2);
+
+            else if(lstrcmpi(temporary,"TYPE")==0&&i3==1) ProjectInfo.windowInfos.back()->type=GetValue(temp2);
             else if(lstrcmpi(temporary,"FILEPATH")==0&&i3==1){
-                ProjectInfo.windowInfos.back().filepath=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(ProjectInfo.windowInfos.back().filepath,temp2);
+                ProjectInfo.windowInfos.back()->filepath=(char *)HeapAlloc(hHeap,0,i2+1);
+                lstrcpy(ProjectInfo.windowInfos.back()->filepath,temp2);
             }
             else if(lstrcmpi(temporary,"ITEM")==0&&i3==1){
-                ProjectInfo.windowInfos.back().pChildInfo=(CHILDINFO *)HeapReAlloc(hHeap,HEAP_ZERO_MEMORY,ProjectInfo.windowInfos.back().pChildInfo,(ProjectInfo.windowInfos.back().NumberOfChildWindows+1)*sizeof(CHILDINFO));
-                pChildInfo=&ProjectInfo.windowInfos.back().pChildInfo[ProjectInfo.windowInfos.back().NumberOfChildWindows];
+                ProjectInfo.windowInfos.back()->pChildInfo=(CHILDINFO *)HeapReAlloc(hHeap,HEAP_ZERO_MEMORY,ProjectInfo.windowInfos.back()->pChildInfo,(ProjectInfo.windowInfos.back()->NumberOfChildWindows+1)*sizeof(CHILDINFO));
+                pChildInfo=&ProjectInfo.windowInfos.back()->pChildInfo[ProjectInfo.windowInfos.back()->NumberOfChildWindows];
 
                 //ID
@@ -2039 +2039 @@
                 }
 
-                ProjectInfo.windowInfos.back().NumberOfChildWindows++;
+                ProjectInfo.windowInfos.back()->NumberOfChildWindows++;
             }
 
@@ -2176 +2176 @@
         return;
     }
-    BOOST_FOREACH( WINDOW_INFO &windowInfo, ProjectInfo.windowInfos )
+    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
     {
-        if(lstrcmpi(NewWindow.name,windowInfo.name)==0){
+        if(lstrcmpi(NewWindow.name,pWindowInfo->name)==0){
             //"\"%s\" ウィンドウは既にプロジェクト内に存在します。"
-            sprintf(temporary,STRING_DUPLICATIONERROR_WINDOW_IN_PROJECT,windowInfo.name);
+            sprintf(temporary,STRING_DUPLICATIONERROR_WINDOW_IN_PROJECT,pWindowInfo->name);
             MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
             return;
         }
-        if(lstrcmpi(NewWindow.HandleName,windowInfo.HandleName)==0){
+        if(lstrcmpi(NewWindow.HandleName,pWindowInfo->HandleName)==0){
             //"\"%s\" ハンドルは既にプロジェクト内に存在します。"
-            sprintf(temporary,STRING_DUPLICATIONERROR_HANDLE_IN_PROJECT,windowInfo.HandleName);
+            sprintf(temporary,STRING_DUPLICATIONERROR_HANDLE_IN_PROJECT,pWindowInfo->HandleName);
             MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
             return;
         }
-        if(lstrcmpi(NewWindow.CallBackName,windowInfo.CallBackName)==0){
+        if(lstrcmpi(NewWindow.CallBackName,pWindowInfo->CallBackName)==0){
             //"\"%s\" プロシージャは既にプロジェクト内に存在します。"
-            sprintf(temporary,STRING_DUPLICATIONERROR_PROC_IN_PROJECT,windowInfo.CallBackName);
+            sprintf(temporary,STRING_DUPLICATIONERROR_PROC_IN_PROJECT,pWindowInfo->CallBackName);
             MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
             return;
@@ -2199 +2199 @@
 
     //ProjectInfo.windowInfos構造体コレクションに追加
-    ProjectInfo.windowInfos.push_back( WINDOW_INFO() );
+    ProjectInfo.windowInfos.push_back( new WindowInfo() );
 
 
@@ -2206 +2206 @@
 
     //ウィンドウ名
-    ProjectInfo.windowInfos.back().name=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.name)+1);
-    lstrcpy(ProjectInfo.windowInfos.back().name,NewWindow.name);
+    ProjectInfo.windowInfos.back()->name=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.name)+1);
+    lstrcpy(ProjectInfo.windowInfos.back()->name,NewWindow.name);
 
     //ハンドル名
-    ProjectInfo.windowInfos.back().HandleName=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.HandleName)+1);
-    lstrcpy(ProjectInfo.windowInfos.back().HandleName,NewWindow.HandleName);
+    ProjectInfo.windowInfos.back()->HandleName=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.HandleName)+1);
+    lstrcpy(ProjectInfo.windowInfos.back()->HandleName,NewWindow.HandleName);
 
     //位置情報
-    ProjectInfo.windowInfos.back().pos.x=-1;
-    ProjectInfo.windowInfos.back().pos.y=-1;
-    ProjectInfo.windowInfos.back().size.cx=480;
-    ProjectInfo.windowInfos.back().size.cy=360;
+    ProjectInfo.windowInfos.back()->pos.x=-1;
+    ProjectInfo.windowInfos.back()->pos.y=-1;
+    ProjectInfo.windowInfos.back()->size.cx=480;
+    ProjectInfo.windowInfos.back()->size.cy=360;
 
     //ウィンドウテキスト
-    ProjectInfo.windowInfos.back().caption=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.name)+1);
-    lstrcpy(ProjectInfo.windowInfos.back().caption,NewWindow.name);
+    ProjectInfo.windowInfos.back()->caption=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.name)+1);
+    lstrcpy(ProjectInfo.windowInfos.back()->caption,NewWindow.name);
 
     //スタイル
@@ -2227 +2227 @@
         case WNDTYPE_DEFAULT:
             //通常ウィンドウ
-            ProjectInfo.windowInfos.back().style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX;
+            ProjectInfo.windowInfos.back()->style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX;
             break;
         case WNDTYPE_MODALDLG:
         case WNDTYPE_MODELESSDLG:
             //ダイアログ テンプレート（最大化、最小化ボタンをなくして、細枠にする）
-            ProjectInfo.windowInfos.back().style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU;
+            ProjectInfo.windowInfos.back()->style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU;
             break;
     }
 
     //拡張スタイル
-    ProjectInfo.windowInfos.back().ExStyle=0;
+    ProjectInfo.windowInfos.back()->ExStyle=0;
 
     //メニュー
-    ProjectInfo.windowInfos.back().MenuID=0;
+    ProjectInfo.windowInfos.back()->MenuID=0;
 
     //ID
-    ProjectInfo.windowInfos.back().id=0;
+    ProjectInfo.windowInfos.back()->id=0;
 
     //背景色
-    ProjectInfo.windowInfos.back().bgColor=COLOR_3DFACE;
+    ProjectInfo.windowInfos.back()->bgColor=COLOR_3DFACE;
 
     //フォント
-    GetDefaultWindowFont(&ProjectInfo.windowInfos.back().LogFont);
+    GetDefaultWindowFont(&ProjectInfo.windowInfos.back()->LogFont);
 
     //アイコン
-    ProjectInfo.windowInfos.back().IconResName=0;
+    ProjectInfo.windowInfos.back()->IconResName=0;
 
     //クラス名
     lstrcpy(temporary,"NORMAL");
-    ProjectInfo.windowInfos.back().ClassName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(ProjectInfo.windowInfos.back().ClassName,temporary);
+    ProjectInfo.windowInfos.back()->ClassName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+    lstrcpy(ProjectInfo.windowInfos.back()->ClassName,temporary);
 
     //コールバック関数名
-    ProjectInfo.windowInfos.back().CallBackName=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.CallBackName)+1);
-    lstrcpy(ProjectInfo.windowInfos.back().CallBackName,NewWindow.CallBackName);
+    ProjectInfo.windowInfos.back()->CallBackName=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.CallBackName)+1);
+    lstrcpy(ProjectInfo.windowInfos.back()->CallBackName,NewWindow.CallBackName);
 
     //タイプ識別
-    ProjectInfo.windowInfos.back().type=NewWindow.type;
+    ProjectInfo.windowInfos.back()->type=NewWindow.type;
 
     //子ウィンドウ情報
-    ProjectInfo.windowInfos.back().NumberOfChildWindows=0;
-    ProjectInfo.windowInfos.back().pChildInfo=(CHILDINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
+    ProjectInfo.windowInfos.back()->NumberOfChildWindows=0;
+    ProjectInfo.windowInfos.back()->pChildInfo=(CHILDINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
 
 
     //メッセージ処理ファイル名
-    sprintf(temporary,"%s.ab",ProjectInfo.windowInfos.back().name);
-    ProjectInfo.windowInfos.back().filepath=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(ProjectInfo.windowInfos.back().filepath,temporary);
+    sprintf(temporary,"%s.ab",ProjectInfo.windowInfos.back()->name);
+    ProjectInfo.windowInfos.back()->filepath=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+    lstrcpy(ProjectInfo.windowInfos.back()->filepath,temporary);
 
 
@@ -2292 +2292 @@
         NewWindow.CallBackName);
 
-    sprintf(temporary,"%s%s.ab",ProjectInfo.dir,ProjectInfo.windowInfos.back().name);
+    sprintf(temporary,"%s%s.ab",ProjectInfo.dir,ProjectInfo.windowInfos.back()->name);
 
     //書き込み
@@ -2311 +2311 @@
     tv.item.iSelectedImage=2;
     tv.hParent=ProjectInfo.hWindowTreeItem;
-    tv.item.pszText=ProjectInfo.windowInfos.back().name;
-
-    ProjectInfo.windowInfos.back().hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
-
-    TreeView_SelectItem(hMaterialTreeView,ProjectInfo.windowInfos.back().hTreeItem);
+    tv.item.pszText=ProjectInfo.windowInfos.back()->name;
+
+    ProjectInfo.windowInfos.back()->hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
+
+    TreeView_SelectItem(hMaterialTreeView,ProjectInfo.windowInfos.back()->hTreeItem);
 
 
     ProjectInfo.ModifyOfMaterial=1;
 
-    NewRadWindow( ProjectInfo.windowInfos.back() );
+    NewRadWindow( *ProjectInfo.windowInfos.back() );
 }
 void Project_Window_Delete(int WndInfoNum){
@@ -2327 +2327 @@
     int i;
 
-    WINDOW_INFO *pWindowInfo = &ProjectInfo.windowInfos[WndInfoNum];
+    WindowInfo *pWindowInfo = ProjectInfo.windowInfos[WndInfoNum];
 
     //ウィンドウが開かれている場合は閉じる
@@ -2357 +2357 @@
 
     //ProjectInfo.windowInfos構造体から削除
-    std::vector<WINDOW_INFO>::iterator it = ProjectInfo.windowInfos.begin();
-    for( int i=0; i!=WndInfoNum ;i++, it++ )
-    {
-    }
-    ProjectInfo.windowInfos.erase( it );
+    ProjectInfo.windowInfos.Erase( WndInfoNum );
 
     ProjectInfo.ModifyOfMaterial=1;

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

@@ -256 +256 @@
         ////////////////
 
-        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
         if(RadInfo.NowDragging>=FRAME_CHANGEPOS_START&&RadInfo.NowDragging<=FRAME_CHANGEPOS_END){
             sprintf(temporary,"pos %d, %d",

trunk/ab5.0/abdev/abdev/abdev.vcproj

@@ -2682 +2682 @@
                 </File>
             </Filter>
+            <Filter
+                Name="ProjectManager"
+                >
+                <File
+                    RelativePath=".\src\ProjectManager\ProjectManager.cpp"
+                    >
+                </File>
+            </Filter>
         </Filter>
         <Filter
@@ -2751 +2759 @@
                 </File>
                 <File
-                    RelativePath=".\include\ProjectManager.h"
-                    >
-                </File>
-                <File
                     RelativePath=".\include\WindowAreaManager.h"
                     >
@@ -2784 +2788 @@
                 <File
                     RelativePath=".\include\WindowComponents\TextView.h"
+                    >
+                </File>
+            </Filter>
+            <Filter
+                Name="ProjectManager"
+                >
+                <File
+                    RelativePath=".\include\ProjectManager\ProjectManager.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\ProjectManager\WindowManager.h"
                     >
                 </File>

trunk/ab5.0/abdev/abdev/include/ProjectManager/ProjectManager.h

@@ -17 +17 @@
     HTREEITEM hMenuTreeItem;
 
-    std::vector<WINDOW_INFO> windowInfos;
+    WindowInfos windowInfos;
     HTREEITEM hWindowTreeItem;
 

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -628 +628 @@
     }
     else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
         int indexOfWndInfo = GetWndInfoNum(MdiInfo[WndNum].path);
 
@@ -807 +807 @@
     }
     else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-        WINDOW_INFO *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
         for(int i3=0;i3<pWindowInfo->NumberOfChildWindows;i3++){
             MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]=i3;

trunk/ab5.0/abdev/abdev/stdafx.h

@@ -52 +52 @@
 #include <MainFrame.h>
 #include <Program.h>
+#include <ProjectManager/WindowManager.h>
 
 #include "Common.h"
 
-#include <ProjectManager.h>
+#include <ProjectManager/ProjectManager.h>