Changeset 624 in dev for trunk

Timestamp:

May 23, 2008, 10:35:36 PM (17 years ago)

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0

Files:

• abdev/BasicCompiler_Common/RSrcSection.cpp (modified) (15 diffs)
• abdev/abdev/Common.h (modified) (6 diffs)
• abdev/abdev/DrawWindow.cpp (modified) (64 diffs)
• abdev/abdev/MenuProc.cpp (modified) (1 diff)
• abdev/abdev/MessageCallOperation.cpp (modified) (8 diffs)
• abdev/abdev/ProjectControl.cpp (modified) (19 diffs)
• abdev/abdev/RadProc.cpp (modified) (44 diffs)
• abdev/abdev/RadSupport.cpp (modified) (11 diffs)
• abdev/abdev/RadToolsAndPropertyProc.cpp (modified) (256 diffs)
• abdev/abdev/Rad_UndoRedo.cpp (modified) (28 diffs)
• abdev/abdev/Resource.cpp (modified) (3 diffs)
• abdev/abdev/WindowControl.cpp (modified) (64 diffs)
• abdev/abdev/abdev.cpp (modified) (1 diff)
• abdev/abdev/abdev.h (modified) (1 diff)
• abdev/abdev/include/ProjectManager/ProjectManager.h (modified) (2 diffs)
• abdev/abdev/include/ProjectManager/WindowManager.h (modified) (5 diffs)
• abdev/abdev/src/MainFrame.cpp (modified) (2 diffs)
• abdev/abdev/src/ProjectManager/ProjectManager.cpp (modified) (6 diffs)
• jenga/include/common/VectorSupporter.h (added)

trunk/ab5.0/abdev/BasicCompiler_Common/RSrcSection.cpp

@@ -96 +96 @@
 
     //カーソルの枚数を計算（CursorNumに格納）
-    for(i3=0;i3<compiler.resourceManager.cursorResources.size();i3++){
-        hFile=CreateFile(compiler.resourceManager.cursorResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.cursorResources )
+    {
+        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
-            compiler.errorMessenger.Output(23,compiler.resourceManager.cursorResources[i3].filepath.c_str(),-1);
+            compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1);
             sw=1;
             continue;
@@ -115 +116 @@
 
     //ビットマップのファイルの有無を確認
-    for(i3=0;i3<compiler.resourceManager.bitmapResources.size();i3++){
-        hFile=CreateFile(compiler.resourceManager.bitmapResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.bitmapResources )
+    {
+        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
-            compiler.errorMessenger.Output(23,compiler.resourceManager.bitmapResources[i3].filepath.c_str(),-1);
+            compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1);
             sw=1;
             continue;
@@ -126 +128 @@
 
     //アイコンの枚数を計算（IconNumに格納）
-    for(i3=0;i3<compiler.resourceManager.iconResources.size();i3++){
-        hFile=CreateFile(compiler.resourceManager.iconResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.iconResources )
+    {
+        hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
-            compiler.errorMessenger.Output(23,compiler.resourceManager.iconResources[i3].filepath.c_str(),-1);
+            compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1);
             sw=1;
             continue;
@@ -284 +287 @@
         i2+=sizeof(IMAGE_RESOURCE_DIRECTORY);
 
-        for(i3=0;i3<compiler.resourceManager.bitmapResources.size();i3++)
+        for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++)
         {
-            ImgDirEntry.Name = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
+            ImgDirEntry.Name = static_cast<DWORD>(compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
                 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol(
                     compiler.resourceManager.bitmapResources[i3].idName
                 )
-            );
+            ));
             ImgDirEntry.OffsetToData=(NextBase+i6+
                 (sizeof(IMAGE_RESOURCE_DIRECTORY)+
@@ -339 +342 @@
         i2+=sizeof(IMAGE_RESOURCE_DIRECTORY);
 
-        for(i3=0;i3<compiler.resourceManager.cursorResources.size();i3++){
-            ImgDirEntry.Name = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
+        for(i3=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){
+            ImgDirEntry.Name = static_cast<DWORD>(compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
                 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol(
                     compiler.resourceManager.cursorResources[i3].idName
                 )
-            );
+            ));
             ImgDirEntry.OffsetToData=(NextBase+i6+
                 (sizeof(IMAGE_RESOURCE_DIRECTORY)+
@@ -369 +372 @@
         i2+=sizeof(IMAGE_RESOURCE_DIRECTORY);
 
-        for(i3=0;i3<compiler.resourceManager.iconResources.size();i3++){
-            ImgDirEntry.Name = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
+        for(i3=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){
+            ImgDirEntry.Name = static_cast<DWORD>(compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(
                 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol(
                     compiler.resourceManager.iconResources[i3].idName
                 )
-            );
+            ));
             ImgDirEntry.OffsetToData=(NextBase+i6+
                 (sizeof(IMAGE_RESOURCE_DIRECTORY)+
@@ -447 +450 @@
     if( !compiler.resourceManager.bitmapResources.empty() ){
         //RT_BITMAP
-        for(i3=0;i3<compiler.resourceManager.bitmapResources.size();i3++){
+        for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++){
             ImgResDir.Characteristics=0;
             ImgResDir.TimeDateStamp=0;
@@ -490 +493 @@
     {
         //RT_GROUP_CURSOR
-        for(i3=0;i3<compiler.resourceManager.cursorResources.size();i3++){
+        for(i3=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){
             ImgResDir.Characteristics=0;
             ImgResDir.TimeDateStamp=0;
@@ -512 +515 @@
     {
         //RT_GROUP_ICON
-        for(i3=0;i3<compiler.resourceManager.iconResources.size();i3++){
+        for(i3=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){
             ImgResDir.Characteristics=0;
             ImgResDir.TimeDateStamp=0;
@@ -590 +593 @@
     //RT_BITMAP
     BitmapEntryBase=DataEntryScheduleNum;
-    for(i3=0;i3<compiler.resourceManager.bitmapResources.size();i3++){
+    for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++){
         dwDataEntrySchedule[DataEntryScheduleNum]=i2;
         DataEntryScheduleNum++;
@@ -608 +611 @@
     //RT_GROUP_CURSOR
     CursorGroupEntryBase=DataEntryScheduleNum;
-    for(i3=0;i3<compiler.resourceManager.cursorResources.size();i3++){
+    for(i3=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){
         dwDataEntrySchedule[DataEntryScheduleNum]=i2;
         DataEntryScheduleNum++;
@@ -617 +620 @@
     //RT_GROUP_ICON
     IconGroupEntryBase=DataEntryScheduleNum;
-    for(i3=0;i3<compiler.resourceManager.iconResources.size();i3++){
+    for(i3=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){
         dwDataEntrySchedule[DataEntryScheduleNum]=i2;
         DataEntryScheduleNum++;
@@ -657 +660 @@
 
     //カーソルリソース
-    for(i3=0,i6=0;i3<compiler.resourceManager.cursorResources.size();i3++){
+    for(i3=0,i6=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){
         hFile=CreateFile(compiler.resourceManager.cursorResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
@@ -737 +740 @@
 
     //ビットマップリソース
-    for(i3=0;i3<compiler.resourceManager.bitmapResources.size();i3++){
+    for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++){
         hFile=CreateFile(compiler.resourceManager.bitmapResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){
@@ -765 +768 @@
 
     //アイコンリソース
-    for(i3=0,i6=0;i3<compiler.resourceManager.iconResources.size();i3++){
+    for(i3=0,i6=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){
         hFile=CreateFile(compiler.resourceManager.iconResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile==INVALID_HANDLE_VALUE){

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

@@ -970 +970 @@
 //WindowControl.cpp
 int GetWndInfoNum(char *name);
-WindowInfo *GetWndInfo( char *name );
+ActiveBasic::PM::WindowInfo *GetWndInfo( char *name );
 HGLOBAL Rad_GetChildInfoClipboardData(int WndNum,int WndInfoNum);
 void Rad_PasteChildInfoClipboardData(int WndNum,HGLOBAL hGlobal);
@@ -976 +976 @@
 void GetItemClassName(char *buffer,int Control);
 void SaveWindowProgram();
-void SaveWindowFile( char *path, const WindowInfos &windowInfos );
+void SaveWindowFile( char *path, const ActiveBasic::PM::WindowInfos &windowInfos );
 _int8 OpenWindowFile(char *path);
 void GetDefaultWindowFont(LOGFONT *LogFont);
@@ -1000 +1000 @@
 
 //RadProc.cpp
-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 NewRadWindow( const ActiveBasic::PM::WindowInfo &windowInfo );
+int InsertDlgItem(int WndNum,int WndInfoNum,int ItemNum,POINT *pPos,SIZE *pSize,const char *IdName,const char *caption,DWORD style_or_WndNum,DWORD ExStyle,int Control,ActiveBasic::PM::ImageReferenceType::EnumType ImageType,const char *ImagePath,DWORD dwInsertType);
 void DeleteDlgItem(int WndNum,int WndInfoNum,int ItemNum,BOOL bNoticeChanging);
 void CursorPos_GlobalToLocal(HWND hwnd,long *x,long *y);
@@ -1012 +1012 @@
 
 //DrawWindow.cpp
-void DrawRadWindow(int WndNum,const WindowInfo *pWindowInfo);
+void DrawRadWindow(int WndNum,const ActiveBasic::PM::WindowInfo *pWindowInfo);
 
 //Rad_UndoRedo.cpp
@@ -1048 +1048 @@
 //RadSupport.cpp
 LRESULT CALLBACK TestWindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);
-void SetSupportDlgData(int WndNum, const WindowInfo &windowInfo );
+void SetSupportDlgData(int WndNum, const ActiveBasic::PM::WindowInfo &windowInfo );
 BOOL CALLBACK DlgRadSupport(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);
 
@@ -1057 +1057 @@
 
 //MenuProc.cpp
-int GetMenuInfoNum(char *name);
+int GetMenuInfoNum(const char *name);
 void HeapMenuDataFree(MENU_INFO *pMenuInfo,int ItemNum,int *NumberOfFreedItem);
 BOOL CALLBACK DlgProject_MenuID_Input(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 WindowInfo *pWindowInfo){
+void DesigningWindow(int WndNum,HDC hdc,POINT *pBasePos,const ActiveBasic::PM::WindowInfo *pWindowInfo){
     extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,i4;
@@ -713 +713 @@
     InsideRect.bottom=InsideRect.top+pWindowInfo->size.cy;
 
-    if(pWindowInfo->style&(WS_BORDER|WS_THICKFRAME)){
+    if(pWindowInfo->GetStyle()&(WS_BORDER|WS_THICKFRAME)){
         DrawEdge(hdc,&InsideRect,EDGE_RAISED,BF_RECT);
 
@@ -725 +725 @@
     ////////////
     //枠を描画
-    if(pWindowInfo->style&(WS_BORDER|WS_THICKFRAME)){
+    if(pWindowInfo->GetStyle()&(WS_BORDER|WS_THICKFRAME)){
         //細枠
         hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_ACTIVEBORDER));
@@ -739 +739 @@
 
         //サイズ変更枠
-        if(pWindowInfo->style&WS_THICKFRAME){
+        if(pWindowInfo->GetStyle()&WS_THICKFRAME){
             Rectangle(hdc,InsideRect.left,InsideRect.top,InsideRect.right,InsideRect.bottom);
 
@@ -758 +758 @@
     MdiInfo[WndNum].MdiRadInfo->ClientPos.y=0;
 
-    if(pWindowInfo->style&(WS_CAPTION&(~WS_BORDER))){
+    if(pWindowInfo->GetStyle()&(WS_CAPTION&(~WS_BORDER))){
         //////////////////////
         //タイトルバーを描画
@@ -773 +773 @@
         }
         else i2=i;
-        if(pWindowInfo->ExStyle&WS_EX_TOOLWINDOW)
+        if(pWindowInfo->GetExStyle()&WS_EX_TOOLWINDOW)
             i3=GetSystemMetrics(SM_CYSMCAPTION);
         else i3=GetSystemMetrics(SM_CYCAPTION);
@@ -805 +805 @@
         rect.right=InsideRect.right;
         rect.bottom=InsideRect.top+i3;
-        DrawText(hdc,pWindowInfo->caption,lstrlen(pWindowInfo->caption),&rect,DT_SINGLELINE|DT_VCENTER|DT_NOPREFIX);
+        DrawText(hdc,pWindowInfo->GetCaption().c_str(),pWindowInfo->GetCaption().size(),&rect,DT_SINGLELINE|DT_VCENTER|DT_NOPREFIX);
         SelectObject(hdc,hOldFont);
         DeleteObject(hFont);
 
         //ボタン
-        if(pWindowInfo->style&WS_SYSMENU){
+        if(pWindowInfo->GetStyle()&WS_SYSMENU){
             //終了ボタン
             size.cx=GetSystemMetrics(SM_CXSIZE)-2;
@@ -857 +857 @@
             GlobalFree(pByte2);
 
-            if(pWindowInfo->style&WS_MAXIMIZEBOX||pWindowInfo->style&WS_MINIMIZEBOX){
+            if(pWindowInfo->GetStyle()&WS_MAXIMIZEBOX||pWindowInfo->GetStyle()&WS_MINIMIZEBOX){
                 //最大化ボタン
                 size.cx=GetSystemMetrics(SM_CXSIZE)-2;
@@ -864 +864 @@
                 pos.y=InsideRect.top+2;
                 DrawButtonEdge(WndNum,&pos,&size);
-                if(!(pWindowInfo->style&WS_MAXIMIZEBOX)){
+                if(!(pWindowInfo->GetStyle()&WS_MAXIMIZEBOX)){
                     pos.x++;
                     pos.y++;
@@ -897 +897 @@
                 pos.y=InsideRect.top+2;
                 DrawButtonEdge(WndNum,&pos,&size);
-                if(!(pWindowInfo->style&WS_MINIMIZEBOX)){
+                if(!(pWindowInfo->GetStyle()&WS_MINIMIZEBOX)){
                     pos.x++;
                     pos.y++;
@@ -927 +927 @@
     }
 
-    if(pWindowInfo->MenuID){
+    if( pWindowInfo->HasMenu() )
+    {
         //メニューラインを3DFACEで描画
         rgb=GetSysColor(COLOR_3DFACE);
@@ -954 +955 @@
     size.cx=InsideRect.right-InsideRect.left;
     size.cy=InsideRect.bottom-InsideRect.top;
-    DrawItemEdgeByExStyle(WndNum,pWindowInfo->ExStyle,&pos,&size);
+    DrawItemEdgeByExStyle(WndNum,pWindowInfo->GetExStyle(),&pos,&size);
 
     //スクロールバーを描画
-    DrawWindowScrollBar(WndNum,pWindowInfo->style,&pos,&size);
+    DrawWindowScrollBar(WndNum,pWindowInfo->GetStyle(),&pos,&size);
 
     //クライアント領域のサイズを設定
@@ -965 +966 @@
     //////////////
     //背景を描画
-    if(pWindowInfo->bgColor==COLOR_3DFACE){
+    if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE){
         //3DFACE
         hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DFACE));
@@ -977 +978 @@
         DeleteObject(hBrush);
     }
-    else if(pWindowInfo->bgColor<=0){
+    else if(pWindowInfo->GetBackgroundColor()<=0){
         //色指定
-        hPen=CreatePen(PS_SOLID,0,-pWindowInfo->bgColor);
-        hBrush=CreateSolidBrush(-pWindowInfo->bgColor);
+        hPen=CreatePen(PS_SOLID,0,-pWindowInfo->GetBackgroundColor());
+        hBrush=CreateSolidBrush(-pWindowInfo->GetBackgroundColor());
         hOldPen=(HPEN)SelectObject(hdc,hPen);
         hOldBrush=(HBRUSH)SelectObject(hdc,hBrush);
@@ -989 +990 @@
         DeleteObject(hBrush);
     }
-    else if(pWindowInfo->bgColor>=0x1000){
+    else if(pWindowInfo->GetBackgroundColor()>=0x1000){
         //ビットマップ
-        for(i2=0;i2<projectInfo.resourceManager.bitmapResources.size();i2++){
-            if( projectInfo.resourceManager.bitmapResources[pWindowInfo->bgColor-0x1000].idName == projectInfo.resourceManager.bitmapResources[i2].idName )
+        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+        {
+            if( projectInfo.resourceManager.bitmapResources[pWindowInfo->GetBackgroundColor()-0x1000].idName == resourceItem.idName )
             {
+                lstrcpy(temporary,resourceItem.filepath.c_str());
+                lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
+                hImage=LoadImage(NULL,temporary,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE);
+
+                hBrush=CreatePatternBrush((HBITMAP)hImage);
+                hOldBrush=(HBRUSH)SelectObject(hdc,hBrush);
+                SetBrushOrgEx(hdc,InsideRect.left,InsideRect.top,&pos);
+                PatBlt(hdc,
+                    InsideRect.left, InsideRect.top,
+                    InsideRect.right-InsideRect.left, InsideRect.bottom-InsideRect.top,PATCOPY);
+                SetBrushOrgEx(hdc,pos.x,pos.y,0);
+                SelectObject(hdc,hOldBrush);
+                DeleteObject(hBrush);
+                DeleteObject(hImage);
+
                 break;
             }
-        }
-        if(i2!=projectInfo.resourceManager.bitmapResources.size()){
-            lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i2].filepath.c_str());
-            lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-            hImage=LoadImage(NULL,temporary,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE);
-
-            hBrush=CreatePatternBrush((HBITMAP)hImage);
-            hOldBrush=(HBRUSH)SelectObject(hdc,hBrush);
-            SetBrushOrgEx(hdc,InsideRect.left,InsideRect.top,&pos);
-            PatBlt(hdc,
-                InsideRect.left, InsideRect.top,
-                InsideRect.right-InsideRect.left, InsideRect.bottom-InsideRect.top,PATCOPY);
-            SetBrushOrgEx(hdc,pos.x,pos.y,0);
-            SelectObject(hdc,hOldBrush);
-            DeleteObject(hBrush);
-            DeleteObject(hImage);
         }
     }
@@ -1019 +1020 @@
     //子ウィンドウ（ダイアログアイテム）を描画
     hFont=CreateFontIndirect(&pWindowInfo->LogFont);
-    BOOST_FOREACH( CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
     {
         pos=pChildInfo->pos;
@@ -1025 +1026 @@
 
         //ExStyleによる縁を描画
-        DrawItemEdgeByExStyle(WndNum,pChildInfo->ExStyle,&pos,&size);
+        DrawItemEdgeByExStyle(WndNum,pChildInfo->GetExStyle(),&pos,&size);
 
         if(pChildInfo->Control==CT_BUTTON){
@@ -1031 +1032 @@
             // Button コントロール
 
-            if((pChildInfo->style&0x0000000F)==BS_DEFPUSHBUTTON){
+            if((pChildInfo->GetStyle()&0x0000000F)==BS_DEFPUSHBUTTON){
                 //標準のボタンの場合（黒枠描画）
                 DrawRectangleInClient(WndNum,
@@ -1046 +1047 @@
             DrawButtonEdge(WndNum,&pos,&size);
 
-            if(!(pChildInfo->style&(BS_ICON|BS_BITMAP))){
+            if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){
                 //キャプション テキスト
 
@@ -1054 +1055 @@
                 rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
 
-                if(pChildInfo->style&BS_MULTILINE) i4=0;
+                if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0;
                 else i4=DT_SINGLELINE;
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pChildInfo->style&BS_CENTER)==BS_CENTER) i2=DT_CENTER;
-                else if(pChildInfo->style&BS_LEFT) i2=DT_LEFT;
-                else if(pChildInfo->style&BS_RIGHT) i2=DT_RIGHT;
+                if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER) i2=DT_CENTER;
+                else if(pChildInfo->GetStyle()&BS_LEFT) i2=DT_LEFT;
+                else if(pChildInfo->GetStyle()&BS_RIGHT) i2=DT_RIGHT;
                 else i2=DT_CENTER;
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pChildInfo->style&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;
-                else if(pChildInfo->style&BS_TOP) i3=DT_TOP;
-                else if(pChildInfo->style&BS_BOTTOM) i3=DT_BOTTOM;
+                if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;
+                else if(pChildInfo->GetStyle()&BS_TOP) i3=DT_TOP;
+                else if(pChildInfo->GetStyle()&BS_BOTTOM) i3=DT_BOTTOM;
                 else i3=DT_VCENTER;
 
                 hOldFont=(HFONT)SelectObject(hdc,hFont);
-                if(pChildInfo->style&WS_DISABLED){
+                if(pChildInfo->GetStyle()&WS_DISABLED){
                     SetTextColor(hdc,RGB(255,255,255));
                     rc2.left=rect.left+1;
@@ -1076 +1077 @@
                     rc2.right=rect.right+1;
                     rc2.bottom=rect.bottom+1;
-                    DrawText(hdc,pChildInfo->caption,-1,&rc2,i4|i2|i3);
+                    DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i4|i2|i3);
                     SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
                 }
                 else SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT));
 
-                DrawText(hdc,pChildInfo->caption,-1,&rect,i4|i2|i3);
+                DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2|i3);
                 SelectObject(hdc,hOldFont);
             }
@@ -1089 +1090 @@
             // CheckBox コントロール
 
-            if(pChildInfo->style&BS_PUSHLIKE){
+            if(pChildInfo->GetStyle()&BS_PUSHLIKE){
                 //ボタンの縁を描画
                 DrawButtonEdge(WndNum,&pos,&size);
@@ -1097 +1098 @@
                 size2.cx=13;
                 size2.cy=13;
-                if(pChildInfo->style&BS_LEFTTEXT)
+                if(pChildInfo->GetStyle()&BS_LEFTTEXT)
                     pos2.x=pos.x+size.cx-size2.cx;
                 else pos2.x=pos.x;
-                if((pChildInfo->style&BS_VCENTER)==BS_VCENTER||
-                    (pChildInfo->style&BS_VCENTER)==0)
+                if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER||
+                    (pChildInfo->GetStyle()&BS_VCENTER)==0)
                     pos2.y=pos.y+(size.cy/2)-(size2.cy/2);
-                else if(pChildInfo->style&BS_TOP)
+                else if(pChildInfo->GetStyle()&BS_TOP)
                     pos2.y=pos.y+1;
-                else if(pChildInfo->style&BS_BOTTOM)
+                else if(pChildInfo->GetStyle()&BS_BOTTOM)
                     pos2.y=pos.y+size.cy-size2.cy-1;
                 DrawItemEdgeByExStyle(WndNum,WS_EX_CLIENTEDGE,&pos2,&size2);
 
-                if(pChildInfo->style&WS_DISABLED)
+                if(pChildInfo->GetStyle()&WS_DISABLED)
                     rgb=GetSysColor(COLOR_3DFACE);
                 else rgb=GetSysColor(COLOR_WINDOW);
@@ -1115 +1116 @@
                     pos2.x+size2.cx, pos2.y+size2.cy,
                     rgb,rgb,1);
-                if(!(pChildInfo->style&BS_LEFTTEXT)) pos.x+=17;
+                if(!(pChildInfo->GetStyle()&BS_LEFTTEXT)) pos.x+=17;
                 else pos.x++;
                 size.cx-=17;
             }
 
-            if(!(pChildInfo->style&(BS_ICON|BS_BITMAP))){
+            if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){
                 //キャプション テキスト
                 rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
@@ -1127 +1128 @@
                 rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
 
-                if(pChildInfo->style&BS_MULTILINE) i4=0;
+                if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0;
                 else i4=DT_SINGLELINE;
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pChildInfo->style&BS_CENTER)==BS_CENTER) i2=DT_CENTER;
-                else if(pChildInfo->style&BS_LEFT) i2=DT_LEFT;
-                else if(pChildInfo->style&BS_RIGHT) i2=DT_RIGHT;
+                if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER) i2=DT_CENTER;
+                else if(pChildInfo->GetStyle()&BS_LEFT) i2=DT_LEFT;
+                else if(pChildInfo->GetStyle()&BS_RIGHT) i2=DT_RIGHT;
                 else i2=DT_LEFT;
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pChildInfo->style&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;
-                else if(pChildInfo->style&BS_TOP) i3=DT_TOP;
-                else if(pChildInfo->style&BS_BOTTOM) i3=DT_BOTTOM;
+                if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;
+                else if(pChildInfo->GetStyle()&BS_TOP) i3=DT_TOP;
+                else if(pChildInfo->GetStyle()&BS_BOTTOM) i3=DT_BOTTOM;
                 else i3=DT_VCENTER;
 
                 hOldFont=(HFONT)SelectObject(hdc,hFont);
-                if(pChildInfo->style&WS_DISABLED){
+                if(pChildInfo->GetStyle()&WS_DISABLED){
                     SetTextColor(hdc,RGB(255,255,255));
                     rc2.left=rect.left+1;
@@ -1149 +1150 @@
                     rc2.right=rect.right+1;
                     rc2.bottom=rect.bottom+1;
-                    DrawText(hdc,pChildInfo->caption,-1,&rc2,i4|i2|i3);
+                    DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i4|i2|i3);
                     SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
                 }
                 else SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT));
 
-                DrawText(hdc,pChildInfo->caption,-1,&rect,i4|i2|i3);
+                DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2|i3);
                 SelectObject(hdc,hOldFont);
             }
@@ -1168 +1169 @@
 
             //内部
-            if(pChildInfo->style&WS_DISABLED)
+            if(pChildInfo->GetStyle()&WS_DISABLED)
                 rgb=GetSysColor(COLOR_3DFACE);
             else rgb=GetSysColor(COLOR_WINDOW);
@@ -1176 +1177 @@
                 rgb,rgb,1);
 
-            if((pChildInfo->style&0x000F)==CBS_SIMPLE){
+            if((pChildInfo->GetStyle()&0x000F)==CBS_SIMPLE){
                 pos.y+=20;
                 size.cy-=20;
@@ -1202 +1203 @@
 
                 pos2.x--;
-                if(pChildInfo->style&WS_DISABLED){
+                if(pChildInfo->GetStyle()&WS_DISABLED){
                     hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT));
                     hOldPen=(HPEN)SelectObject(hdc,hPen);
@@ -1233 +1234 @@
 
             //内部
-            if(pChildInfo->style&WS_DISABLED||pChildInfo->style&ES_READONLY)
+            if(pChildInfo->GetStyle()&WS_DISABLED||pChildInfo->GetStyle()&ES_READONLY)
                 rgb=GetSysColor(COLOR_3DFACE);
             else rgb=GetSysColor(COLOR_WINDOW);
@@ -1247 +1248 @@
             rect.bottom=pos.y+size.cy-1+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
 
-            if(pChildInfo->style&ES_MULTILINE) i4=0;
+            if(pChildInfo->GetStyle()&ES_MULTILINE) i4=0;
             else i4=DT_SINGLELINE;
 
             //ビットを考慮してES_LEFTを最後に検討する
-            if(pChildInfo->style&ES_CENTER) i2=DT_CENTER;
-            else if(pChildInfo->style&ES_RIGHT) i2=DT_RIGHT;
+            if(pChildInfo->GetStyle()&ES_CENTER) i2=DT_CENTER;
+            else if(pChildInfo->GetStyle()&ES_RIGHT) i2=DT_RIGHT;
             else i2=DT_LEFT;
 
             //文字色を設定
-            if(pChildInfo->style&WS_DISABLED)
+            if(pChildInfo->GetStyle()&WS_DISABLED)
                 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
             else
@@ -1262 +1263 @@
 
             hOldFont=(HFONT)SelectObject(hdc,hFont);
-            DrawText(hdc,pChildInfo->caption,-1,&rect,i4|i2);
+            DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2);
             SelectObject(hdc,hOldFont);
         }
@@ -1271 +1272 @@
 
             hOldFont=(HFONT)SelectObject(hdc,hFont);
-            GetTextExtentPoint32(hdc,pChildInfo->caption,lstrlen(pChildInfo->caption),&size2);
+            GetTextExtentPoint32(hdc,pChildInfo->GetCaption().c_str(),pChildInfo->GetCaption().size(),&size2);
 
             //枠を描画
@@ -1281 +1282 @@
 
             //ビットを考慮してBS_CENTERを最初に検討する
-            if((pChildInfo->style&BS_CENTER)==BS_CENTER){
+            if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER){
                 rect.left=pos.x+(size.cx/2)-(size2.cx/2)-3;
                 rect.right=rect.left+size2.cx+4;
             }
-            else if(pChildInfo->style&BS_RIGHT){
+            else if(pChildInfo->GetStyle()&BS_RIGHT){
                 rect.right=pos.x+size.cx-7;
                 rect.left=rect.right-size2.cx-4;
@@ -1296 +1297 @@
             rect.bottom=pos.y+size2.cy;
 
-            if(pWindowInfo->bgColor==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE);
-            else rgb=-pWindowInfo->bgColor;
+            if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE);
+            else rgb=-pWindowInfo->GetBackgroundColor();
             DrawRectangleInClient(WndNum,rect.left,rect.top,rect.right,rect.bottom,rgb,rgb,1);
 
-            if(!((pChildInfo->style&BS_ICON)||(pChildInfo->style&BS_BITMAP))){
+            if(!((pChildInfo->GetStyle()&BS_ICON)||(pChildInfo->GetStyle()&BS_BITMAP))){
                 rect.left+=MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
                 rect.top+=MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
@@ -1309 +1310 @@
 
                 //テキストを描画
-                if(pChildInfo->style&WS_DISABLED){
+                if(pChildInfo->GetStyle()&WS_DISABLED){
                     SetTextColor(hdc,RGB(255,255,255));
                     rc2.left=rect.left+1;
@@ -1315 +1316 @@
                     rc2.right=rect.right+1;
                     rc2.bottom=rect.bottom+1;
-                    DrawText(hdc,pChildInfo->caption,-1,&rc2,DT_SINGLELINE);
+                    DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,DT_SINGLELINE);
                     SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
                 }
@@ -1321 +1322 @@
                     SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT));
 
-                DrawText(hdc,pChildInfo->caption,-1,&rect,DT_SINGLELINE);
+                DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,DT_SINGLELINE);
             }
             SelectObject(hdc,hOldFont);
@@ -1329 +1330 @@
             ////////////////////////////////////
             // 水平スクロールバー コントロール
-            DrawScrollBar(WndNum,pChildInfo->style,0,&pos,&size);
+            DrawScrollBar(WndNum,pChildInfo->GetStyle(),0,&pos,&size);
         }
 
@@ -1337 +1338 @@
             HDC memdc;
 
-            if((pChildInfo->style&0x0000000F)==SS_BLACKFRAME)
+            if((pChildInfo->GetStyle()&0x0000000F)==SS_BLACKFRAME)
                 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(0,0,0),0,0);
-            else if((pChildInfo->style&0x0000000F)==SS_GRAYFRAME)
+            else if((pChildInfo->GetStyle()&0x0000000F)==SS_GRAYFRAME)
                 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,GetSysColor(COLOR_3DSHADOW),0,0);
-            else if((pChildInfo->style&0x0000000F)==SS_WHITEFRAME)
+            else if((pChildInfo->GetStyle()&0x0000000F)==SS_WHITEFRAME)
                 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(255,255,255),0,0);
-            else if((pChildInfo->style&0x0000001F)==SS_ETCHEDFRAME){
+            else if((pChildInfo->GetStyle()&0x0000001F)==SS_ETCHEDFRAME){
                 rect.left=pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
                 rect.top=pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
@@ -1350 +1351 @@
                 DrawEdge(hdc,&rect,EDGE_ETCHED,BF_RECT);
             }
-            else if((pChildInfo->style&0x0000000F)==SS_BLACKRECT)
+            else if((pChildInfo->GetStyle()&0x0000000F)==SS_BLACKRECT)
                 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,GetSysColor(COLOR_3DDKSHADOW),GetSysColor(COLOR_3DDKSHADOW),1);
-            else if((pChildInfo->style&0x0000000F)==SS_GRAYRECT)
+            else if((pChildInfo->GetStyle()&0x0000000F)==SS_GRAYRECT)
                 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,GetSysColor(COLOR_3DSHADOW),GetSysColor(COLOR_3DSHADOW),1);
-            else if((pChildInfo->style&0x0000000F)==SS_WHITERECT)
+            else if((pChildInfo->GetStyle()&0x0000000F)==SS_WHITERECT)
                 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(255,255,255),RGB(255,255,255),1);
-            else if((pChildInfo->style&0x0000000F)==SS_ICON){
-                if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_FILE)
-                    lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path);
-                else{
-                    for(i2=0;i2<projectInfo.resourceManager.iconResources.size();i2++)
+            else if((pChildInfo->GetStyle()&0x0000000F)==SS_ICON)
+            {
+                if(pChildInfo->image.IsFile())
+                {
+                    lstrcpy(temporary,pChildInfo->image.path.c_str());
+                }
+                else
+                {
+                    bool isMatch = false;
+                    BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
                     {
-                        if( projectInfo.resourceManager.iconResources[i2].idName == pChildInfo->ImageCtrlInfo.path )
+                        if( resourceItem.idName == pChildInfo->image.path )
                         {
+                            isMatch = true;
+                            lstrcpy(temporary,resourceItem.filepath.c_str());
                             break;
                         }
                     }
-                    if(i2==projectInfo.resourceManager.iconResources.size()) goto NonIconImage;
-
-                    lstrcpy(temporary,projectInfo.resourceManager.iconResources[i2].filepath.c_str());
+                    if( !isMatch )
+                    {
+                        goto NonIconImage;
+                    }
                 }
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
@@ -1380 +1389 @@
 
                     //ExStyleによる縁を再描画
-                    DrawItemEdgeByExStyle(WndNum,pChildInfo->ExStyle,&pos,&size);
+                    DrawItemEdgeByExStyle(WndNum,pChildInfo->GetExStyle(),&pos,&size);
 
                     DrawIcon(hdc,
@@ -1401 +1410 @@
                 }
             }
-            else if((pChildInfo->style&0x0000000F)==SS_BITMAP){
+            else if((pChildInfo->GetStyle()&0x0000000F)==SS_BITMAP){
                 BITMAP Bitmap;
 
-                if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_FILE)
-                    lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path);
+                if(pChildInfo->image.IsFile())
+                {
+                    lstrcpy(temporary,pChildInfo->image.path.c_str());
+                }
                 else{
-                    for(i2=0;i2<projectInfo.resourceManager.bitmapResources.size();i2++){
-                        if( projectInfo.resourceManager.bitmapResources[i2].idName == pChildInfo->ImageCtrlInfo.path )
+                    bool isMatch = false;
+                    BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+                    {
+                        if( resourceItem.idName == pChildInfo->image.path )
                         {
+                            lstrcpy(temporary,resourceItem.filepath.c_str());
+                            isMatch = true;
                             break;
                         }
                     }
-                    if(i2==projectInfo.resourceManager.bitmapResources.size()) goto NonBitmapImage;
-
-                    lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i2].filepath.c_str());
+                    if( !isMatch )
+                    {
+                        goto NonBitmapImage;
+                    }
                 }
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
@@ -1428 +1444 @@
 
                     //ExStyleによる縁を再描画
-                    DrawItemEdgeByExStyle(WndNum,pChildInfo->ExStyle,&pos,&size);
+                    DrawItemEdgeByExStyle(WndNum,pChildInfo->GetExStyle(),&pos,&size);
 
                     memdc=CreateCompatibleDC(hdc);
@@ -1461 +1477 @@
 
             //内部
-            if(pChildInfo->style&WS_DISABLED)
+            if(pChildInfo->GetStyle()&WS_DISABLED)
                 rgb=GetSysColor(COLOR_3DFACE);
             else rgb=GetSysColor(COLOR_WINDOW);
@@ -1469 +1485 @@
                 rgb,rgb,1);
 
-            if(pChildInfo->style&LBS_DISABLENOSCROLL)
-                DrawWindowScrollBar(WndNum,pChildInfo->style|WS_DISABLED,&pos,&size);
+            if(pChildInfo->GetStyle()&LBS_DISABLENOSCROLL)
+                DrawWindowScrollBar(WndNum,pChildInfo->GetStyle()|WS_DISABLED,&pos,&size);
         }
 
@@ -1478 +1494 @@
 
             //内部
-            if(pChildInfo->style&WS_DISABLED)
+            if(pChildInfo->GetStyle()&WS_DISABLED)
                 rgb=GetSysColor(COLOR_3DFACE);
             else rgb=GetSysColor(COLOR_WINDOW);
@@ -1486 +1502 @@
                 rgb,rgb,1);
 
-            if((pChildInfo->style&LVS_REPORT)&&
-                (!((pChildInfo->style&LVS_LIST)==LVS_LIST))){
+            if((pChildInfo->GetStyle()&LVS_REPORT)&&
+                (!((pChildInfo->GetStyle()&LVS_LIST)==LVS_LIST))){
                 //レポート ビュー
                 size.cy=16;
@@ -1504 +1520 @@
             size.cy-=2;
             rgb=GetSysColor(COLOR_ACTIVECAPTION);
-            if(pChildInfo->style&PBS_SMOOTH){
-                if(pChildInfo->style&PBS_VERTICAL){
+            if(pChildInfo->GetStyle()&PBS_SMOOTH){
+                if(pChildInfo->GetStyle()&PBS_VERTICAL){
                     pos.y+=(long)((double)size.cy*0.3);
                     DrawRectangleInClient(WndNum,
@@ -1520 +1536 @@
             }
             else{
-                if(pChildInfo->style&PBS_VERTICAL){
+                if(pChildInfo->GetStyle()&PBS_VERTICAL){
                     pos.y+=(long)((double)size.cy*0.3);
                     i3=(size.cx*2)/3;
@@ -1548 +1564 @@
             // RadioButton コントロール
 
-            if(pChildInfo->style&BS_PUSHLIKE){
+            if(pChildInfo->GetStyle()&BS_PUSHLIKE){
                 //ボタンの縁を描画
                 DrawButtonEdge(WndNum,&pos,&size);
@@ -1556 +1572 @@
                 size2.cx=12;
                 size2.cy=12;
-                if(pChildInfo->style&BS_LEFTTEXT)
+                if(pChildInfo->GetStyle()&BS_LEFTTEXT)
                     pos2.x=pos.x+size.cx-size2.cx;
                 else pos2.x=pos.x+1;
-                if((pChildInfo->style&BS_VCENTER)==BS_VCENTER||
-                    (pChildInfo->style&BS_VCENTER)==0)
+                if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER||
+                    (pChildInfo->GetStyle()&BS_VCENTER)==0)
                     pos2.y=pos.y+(size.cy/2)-(size2.cy/2);
-                else if(pChildInfo->style&BS_TOP)
+                else if(pChildInfo->GetStyle()&BS_TOP)
                     pos2.y=pos.y+1;
-                else if(pChildInfo->style&BS_BOTTOM)
+                else if(pChildInfo->GetStyle()&BS_BOTTOM)
                     pos2.y=pos.y+size.cy-size2.cy-1;
 
@@ -1575 +1591 @@
 
                     if(rgb==RGB(255,255,0)){
-                        if(pWindowInfo->bgColor==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE);
-                        else rgb=-pWindowInfo->bgColor;
+                        if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE);
+                        else rgb=-pWindowInfo->GetBackgroundColor();
                     }
 
@@ -1589 +1605 @@
                     //内部
                     else if(rgb==RGB(255,255,255)){
-                        if(pChildInfo->style&WS_DISABLED) rgb=GetSysColor(COLOR_3DFACE);
+                        if(pChildInfo->GetStyle()&WS_DISABLED) rgb=GetSysColor(COLOR_3DFACE);
                     }
 
@@ -1607 +1623 @@
                 GlobalFree(pByte2);
 
-                if(!(pChildInfo->style&BS_LEFTTEXT)) pos.x+=17;
+                if(!(pChildInfo->GetStyle()&BS_LEFTTEXT)) pos.x+=17;
                 else pos.x++;
                 size.cx-=17;
             }
 
-            if(!(pChildInfo->style&(BS_ICON|BS_BITMAP))){
+            if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){
                 //キャプション テキスト
                 rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x;
@@ -1619 +1635 @@
                 rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y;
 
-                if(pChildInfo->style&BS_MULTILINE) i4=0;
+                if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0;
                 else i4=DT_SINGLELINE;
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pChildInfo->style&BS_CENTER)==BS_CENTER) i2=DT_CENTER;
-                else if(pChildInfo->style&BS_LEFT) i2=DT_LEFT;
-                else if(pChildInfo->style&BS_RIGHT) i2=DT_RIGHT;
+                if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER) i2=DT_CENTER;
+                else if(pChildInfo->GetStyle()&BS_LEFT) i2=DT_LEFT;
+                else if(pChildInfo->GetStyle()&BS_RIGHT) i2=DT_RIGHT;
                 else i2=DT_LEFT;
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pChildInfo->style&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;
-                else if(pChildInfo->style&BS_TOP) i3=DT_TOP;
-                else if(pChildInfo->style&BS_BOTTOM) i3=DT_BOTTOM;
+                if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;
+                else if(pChildInfo->GetStyle()&BS_TOP) i3=DT_TOP;
+                else if(pChildInfo->GetStyle()&BS_BOTTOM) i3=DT_BOTTOM;
                 else i3=DT_VCENTER;
 
                 hOldFont=(HFONT)SelectObject(hdc,hFont);
-                if(pChildInfo->style&WS_DISABLED){
+                if(pChildInfo->GetStyle()&WS_DISABLED){
                     SetTextColor(hdc,RGB(255,255,255));
                     rc2.left=rect.left+1;
@@ -1641 +1657 @@
                     rc2.right=rect.right+1;
                     rc2.bottom=rect.bottom+1;
-                    DrawText(hdc,pChildInfo->caption,-1,&rc2,i4|i2|i3);
+                    DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i4|i2|i3);
                     SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
                 }
                 else SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT));
 
-                DrawText(hdc,pChildInfo->caption,-1,&rect,i4|i2|i3);
+                DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2|i3);
                 SelectObject(hdc,hOldFont);
             }
@@ -1662 +1678 @@
 
             //ビットを考慮してSS_LEFTを最後に検討する
-            if(pChildInfo->style&SS_CENTER) i2=DT_CENTER;
-            else if(pChildInfo->style&SS_RIGHT) i2=DT_RIGHT;
+            if(pChildInfo->GetStyle()&SS_CENTER) i2=DT_CENTER;
+            else if(pChildInfo->GetStyle()&SS_RIGHT) i2=DT_RIGHT;
             else i2=DT_LEFT;
 
             hOldFont=(HFONT)SelectObject(hdc,hFont);
-            if(pChildInfo->style&WS_DISABLED){
+            if(pChildInfo->GetStyle()&WS_DISABLED){
                 SetTextColor(hdc,RGB(255,255,255));
                 rc2.left=rect.left+1;
@@ -1673 +1689 @@
                 rc2.right=rect.right+1;
                 rc2.bottom=rect.bottom+1;
-                DrawText(hdc,pChildInfo->caption,-1,&rc2,i2);
+                DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i2);
                 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
             }
@@ -1680 +1696 @@
 
             //折り返すかどうか
-            if(!(pChildInfo->style&SS_LEFTNOWORDWRAP)){
+            if(!(pChildInfo->GetStyle()&SS_LEFTNOWORDWRAP)){
                 i2|=DT_WORDBREAK;
             }
 
-            DrawText(hdc,pChildInfo->caption,-1,&rect,i2);
+            DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i2);
             SelectObject(hdc,hOldFont);
         }
@@ -1692 +1708 @@
             // TrackBar コントロール
 
-            if(pChildInfo->style&TBS_VERT){
+            if(pChildInfo->GetStyle()&TBS_VERT){
                 pos.x+=2;
                 size.cx-=2;
@@ -1731 +1747 @@
 
             //内部
-            if(pChildInfo->style&WS_DISABLED)
+            if(pChildInfo->GetStyle()&WS_DISABLED)
                 rgb=GetSysColor(COLOR_3DFACE);
             else rgb=GetSysColor(COLOR_WINDOW);
@@ -1743 +1759 @@
             ///////////////////////////////
             // アップ ダウン コントロール
-            if(pChildInfo->style&UDS_HORZ)
-                DrawUpDownControl(WndNum,pChildInfo->style,0,&pos,&size);
-            else DrawUpDownControl(WndNum,pChildInfo->style,1,&pos,&size);
+            if(pChildInfo->GetStyle()&UDS_HORZ)
+                DrawUpDownControl(WndNum,pChildInfo->GetStyle(),0,&pos,&size);
+            else DrawUpDownControl(WndNum,pChildInfo->GetStyle(),1,&pos,&size);
         }
 
@@ -1751 +1767 @@
             ////////////////////////////////////
             // 垂直スクロールバー コントロール
-            DrawScrollBar(WndNum,pChildInfo->style,1,&pos,&size);
+            DrawScrollBar(WndNum,pChildInfo->GetStyle(),1,&pos,&size);
         }
     }
     DeleteObject(hFont);
 }
-void DrawRadWindow(int WndNum,const WindowInfo *pWindowInfo){
+void DrawRadWindow(int WndNum,const ActiveBasic::PM::WindowInfo *pWindowInfo){
     extern MDIINFO MdiInfo[MAX_WNDNUM];
     HBRUSH hOldBrush;

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

@@ -11 +11 @@
 #endif
 
-int GetMenuInfoNum(char *name){
+int GetMenuInfoNum(const char *name){
     int i;
     for(i=0;i<projectInfo.NumberOfMenu;i++){

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

@@ -20 +20 @@
     if(lstrcmp(EventName,"MenuClick")==0) return CT_MENU;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
-    BOOST_FOREACH( CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
     {
-        if(lstrcmp(buffer,pChildInfo->IdName)==0)
+        if( pChildInfo->GetName() == buffer )
         {
             return pChildInfo->Control;
@@ -36 +36 @@
     char *buffer,**ppNames,temporary[MAX_PATH],temp2[MAX_PATH];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     NameLen=pWindowInfo->GetName().size();
@@ -135 +135 @@
     POINT pos;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     hChild=OpenFileWithExtension( projectInfo.GetWorkDir().GetPath() + pWindowInfo->filepath );
@@ -220 +220 @@
     char temporary[MAX_PATH];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     MaxCount=ListView_GetItemCount(hList);
@@ -298 +298 @@
                 sprintf(EventName,"%s_%s_%s",
                     pWindowInfo->GetName().c_str(),
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->IdName,
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetName().c_str(),
                     temporary);
                 break;
@@ -403 +403 @@
 
     WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
     i=0;
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
@@ -441 +441 @@
             //メニュー イベント
             SendDlgItemMessage(hDlg,IDC_MENU,BM_SETCHECK,BST_CHECKED,0);
-            if(pWindowInfo->MenuID){
+            if( pWindowInfo->HasMenu() )
+            {
                 int MenuInfoNum;
-                MenuInfoNum=GetMenuInfoNum(pWindowInfo->MenuID);
+                MenuInfoNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str());
                 i=0;
                 i2=0;
@@ -647 +648 @@
             {
                 WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
-                NowMenuNum=GetMenuInfoNum(pWindowInfo->MenuID);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+                NowMenuNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str());
             }
             break;

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

@@ -191 +191 @@
                         }
                     }
-                    for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){
-                        if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){
+                    BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
+                    {
+                        if( resourceItem.hTreeItem == hTreeItem )
+                        {
                             NewIconEditWindow(
-                                projectInfo.GetWorkDir().GetFullPath( projectInfo.resourceManager.iconResources[i].filepath ).c_str()
+                                projectInfo.GetWorkDir().GetFullPath( resourceItem.filepath ).c_str()
                             );
                             break;
@@ -202 +204 @@
                 case IDM_MATERIALTREE_DELETE:
                     hTreeItem=TreeView_GetSelection(hMaterialTreeView);
-                    for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){
+                    for(i=0;i<static_cast<int>(projectInfo.resourceManager.cursorResources.size());i++){
                         if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){
 
@@ -213 +215 @@
                         }
                     }
-                    for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){
+                    for(i=0;i<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i++){
                         if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){
 
@@ -224 +226 @@
                         }
                     }
-                    for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){
+                    for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){
                         if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){
 
@@ -261 +263 @@
                     extern char NewIdName[MAX_PATH];
                     hTreeItem=TreeView_GetSelection(hMaterialTreeView);
-                    for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){
+                    for(i=0;i<static_cast<int>(projectInfo.resourceManager.cursorResources.size());i++){
                         if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){
                             Project_Cursor_RenameID(i);
@@ -267 +269 @@
                         }
                     }
-                    for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){
+                    for(i=0;i<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i++){
                         if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){
                             Project_Bitmap_RenameID(i);
@@ -273 +275 @@
                         }
                     }
-                    for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){
+                    for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){
                         if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){
                             Project_Icon_RenameID(i);
@@ -314 +316 @@
                 case IDM_MATERIALTREE_ICON_SETMAIN:
                     hTreeItem=TreeView_GetSelection(hMaterialTreeView);
-                    for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){
+                    for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){
                         if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){
                             if(i==0) break;
@@ -1052 +1054 @@
         // ウィンドウ定義ファイル（*.wnd）を作成
         /////////////////////////////////////////
-        WindowInfos windowInfos;
-        windowInfos.push_back( new WindowInfo() );
+        ActiveBasic::PM::WindowInfos windowInfos;
+        windowInfos.push_back( new ActiveBasic::PM::WindowInfo() );
         windowInfos.back()->SetName( "MainWnd" );
         windowInfos.back()->SetHandleName( "hMainWnd" );
@@ -1060 +1062 @@
         windowInfos.back()->size.cx=480;
         windowInfos.back()->size.cy=360;
-        windowInfos.back()->caption=NewProjectInfo.name;
+        windowInfos.back()->SetCaption( 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()->SetStyle( 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;
+        {
+            windowInfos.back()->SetStyle( WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU );
+        }
+        windowInfos.back()->SetExStyle( 0 );
+        windowInfos.back()->SetMenuIdName( "" );
+        windowInfos.back()->SetBackgroundColor( COLOR_3DFACE );
         GetDefaultWindowFont(&windowInfos.back()->LogFont);
-        windowInfos.back()->IconResName=0;
-        windowInfos.back()->ClassName="NORMAL";
+        windowInfos.back()->SetIconResourceName( "" );
+        windowInfos.back()->SetClassName( "NORMAL" );
         windowInfos.back()->CallBackName="MainWndProc";
         windowInfos.back()->type=WNDTYPE_DEFAULT;
@@ -1142 +1147 @@
     tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv);
     hCursorTreeItemForProjectView = tv.hParent;
-    for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){
+    BOOST_FOREACH( ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.cursorResources )
+    {
         tv.item.iImage=6;
         tv.item.iSelectedImage=6;
-        lstrcpy( temporary, projectInfo.resourceManager.cursorResources[i].idName.c_str() );
+        lstrcpy( temporary, resourceItem.idName.c_str() );
         tv.item.pszText=temporary;
-        projectInfo.resourceManager.cursorResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
+        resourceItem.hTreeItem = TreeView_InsertItem(hMaterialTreeView,&tv);
     }
 
@@ -1158 +1164 @@
     tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv);
     hBitmapTreeItemForProjectView = tv.hParent;
-    for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){
+    BOOST_FOREACH( ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+    {
         tv.item.iImage=5;
         tv.item.iSelectedImage=5;
-        lstrcpy( temporary, projectInfo.resourceManager.bitmapResources[i].idName.c_str() );
+        lstrcpy( temporary, resourceItem.idName.c_str() );
         tv.item.pszText=temporary;
-        projectInfo.resourceManager.bitmapResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
+        resourceItem.hTreeItem = TreeView_InsertItem(hMaterialTreeView,&tv);
     }
 
@@ -1174 +1181 @@
     tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv);
     hIconTreeItemForProjectView = tv.hParent;
-    for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){
+    for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){
         tv.item.iImage=4;
         tv.item.iSelectedImage=4;
@@ -1209 +1216 @@
     tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv);
     projectInfo.hWindowTreeItem=tv.hParent;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         tv.item.iImage=2;
@@ -1356 +1363 @@
                             }
                         }
-                        else if(lstrcmpi(temporary,"icon")==0){
-                            for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){
-                                if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){
+                        else if(lstrcmpi(temporary,"icon")==0)
+                        {
+                            BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
+                            {
+                                if(lstrcmpi(resourceItem.filepath.c_str(),temp2)==0){
                                     NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() );
                                     break;
@@ -1478 +1487 @@
                         }
                         else if(lstrcmpi(temporary,"icon")==0){
-                            for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){
-                                if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){
+                            BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
+                            {
+                                if(lstrcmpi(resourceItem.filepath.c_str(),temp2)==0){
                                     NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() );
                                     break;
@@ -1597 +1607 @@
         else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
             if(MdiInfo[WndNum].MdiIconEditInfo->bModify){
-                for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){
-                    lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str());
+                BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
+                {
+                    lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
                     if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1;
@@ -1671 +1682 @@
         }
         else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-            BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+            BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
             {
                 if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str())==0){
@@ -1690 +1701 @@
         }
         else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
-            for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){
-                lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str());
+            BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
+            {
+                lstrcpy(temporary,resourceItem.filepath.c_str());
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
                 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
-                    sprintf(buffer+i2,"icon,%s\r\n",projectInfo.resourceManager.iconResources[i].filepath.c_str());
+                    sprintf(buffer+i2,"icon,%s\r\n",resourceItem.filepath.c_str());
                     i2+=lstrlen(buffer+i2);
                     break;

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

@@ -4 +4 @@
 #include "common.h"
 
-void NewRadWindow( const WindowInfo &windowInfo )
+void NewRadWindow( const ActiveBasic::PM::WindowInfo &windowInfo )
 {
     extern HINSTANCE hInst,hResInst;
@@ -153 +153 @@
 }
 
-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){
+int InsertDlgItem(int WndNum,int WndInfoNum,int ItemNum,POINT *pPos,SIZE *pSize,const char *IdName,const char *caption,DWORD style_or_WndNum,DWORD ExStyle,int Control,ActiveBasic::PM::ImageReferenceType::EnumType ImageType,const char *ImagePath,DWORD dwInsertType){
     //dwInsertType
     //0 … 元に戻す、やり直し
@@ -164 +164 @@
     char temporary[MAX_PATH];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
-
-    CHILDINFO *pChildInfo = new CHILDINFO();
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+
+    ActiveBasic::PM::ChildWindowInfo *pChildInfo = new ActiveBasic::PM::ChildWindowInfo();
 
     if(ItemNum==-1)
@@ -175 +175 @@
     else
     {
-        std::vector<CHILDINFO *>::iterator it = pWindowInfo->childWindowInfos.begin();
+        ActiveBasic::PM::ChildWindowInfos::iterator it = pWindowInfo->childWindowInfos.begin();
         for( int i=0; i<ItemNum; i++ )
         {
@@ -187 +187 @@
     //ID
     if(ItemNum==-1){
-        for(i=lstrlen(IdName)-1;i>=0;i--){
-            if(!('0'<=IdName[i]&&IdName[i]<='9')) break;
+        char temp2[1024];
+        lstrcpy( temp2, IdName );
+        for(i=lstrlen(temp2)-1;i>=0;i--){
+            if(!('0'<=temp2[i]&&temp2[i]<='9')) break;
         }
         i++;
 
-        if(IdName[i]!='\0'){
-            i2=atoi(IdName+i)+1;
+        if(temp2[i]!='\0'){
+            i2=atoi(temp2+i)+1;
             if(dwInsertType==2) i2--;
-            IdName[i]=0;
+            temp2[i]=0;
         }
         else{
@@ -202 +204 @@
         }
 
-        if(i2==0) lstrcpy(temporary,IdName);
-        else sprintf(temporary,"%s%d",IdName,i2);
+        if(i2==0) lstrcpy(temporary,temp2);
+        else sprintf(temporary,"%s%d",temp2,i2);
 SearchStart:
-        for(i=0;i<pWindowInfo->childWindowInfos.size();i++){
-            if(i!=NewItemNum){
-                if(lstrcmp(pWindowInfo->childWindowInfos[i]->IdName,temporary)==0){
+        for( i=0; i<static_cast<int>(pWindowInfo->childWindowInfos.size()); i++ )
+        {
+            if( i != NewItemNum )
+            {
+                if( pWindowInfo->childWindowInfos[i]->GetName() == temporary )
+                {
                     i2++;
-                    sprintf(temporary,"%s%d",IdName,i2);
+                    sprintf(temporary,"%s%d",temp2,i2);
                     goto SearchStart;
                 }
@@ -216 +221 @@
     }
     else lstrcpy(temporary,IdName);
-    pChildInfo->IdName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(pChildInfo->IdName,temporary);
+    pChildInfo->SetName( temporary );
 
     //位置
@@ -235 +239 @@
     }
     else lstrcpy(temporary,caption);
-    pChildInfo->caption=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(pChildInfo->caption,temporary);
+    pChildInfo->SetCaption( temporary );
 
     //スタイル
-    pChildInfo->style=style_or_WndNum;
+    pChildInfo->SetStyle( style_or_WndNum );
 
     //拡張スタイル
-    pChildInfo->ExStyle=ExStyle;
+    pChildInfo->SetExStyle( ExStyle );
 
     //クラス名
@@ -249 +252 @@
     if(Control==CT_IMAGEBOX){
         //イメージ ボックスの場合
-        pChildInfo->ImageCtrlInfo.type=ImageType;
+        pChildInfo->image.type = ImageType;
         if(!ImagePath)
-            pChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
+        {
+            pChildInfo->image.path = "";
+        }
         else{
-            pChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,lstrlen(ImagePath)+1);
-            lstrcpy(pChildInfo->ImageCtrlInfo.path,ImagePath);
+            pChildInfo->image.path = ImagePath;
         }
     }
@@ -269 +273 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     //変更情報
@@ -276 +280 @@
 
     //子ウィンドウのメモリを解放
-    HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->IdName);
-    HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->caption);
-    if(pWindowInfo->childWindowInfos[ItemNum]->Control==CT_IMAGEBOX){
-        //イメージ ボックスの場合
-        HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->ImageCtrlInfo.path);
-    }
     delete pWindowInfo->childWindowInfos[ItemNum];
 
-    std::vector<CHILDINFO *>::iterator it = pWindowInfo->childWindowInfos.begin();
+    ActiveBasic::PM::ChildWindowInfos::iterator it = pWindowInfo->childWindowInfos.begin();
     for( int i=0; i<ItemNum; i++ )
     {
@@ -346 +344 @@
     RECT rect;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     hdc=GetDC(hwnd);
@@ -352 +350 @@
     sw=0;
     if(pobj_nv->bLineAdjust&&bLA){
-        for(i=0;i<pWindowInfo->childWindowInfos.size();i++){
-            const CHILDINFO *pChildInfo = pWindowInfo->childWindowInfos[i];
+        for( i=0; i<static_cast<int>(pWindowInfo->childWindowInfos.size()); i++ )
+        {
+            const ActiveBasic::PM::ChildWindowInfo *pChildInfo = pWindowInfo->childWindowInfos[i];
             if(i==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]) continue;
             if(pChildInfo->Control !=
@@ -449 +448 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]==SELECT_WINDOW){
@@ -546 +545 @@
     SCROLLINFO ScrollInfo;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg);
@@ -607 +606 @@
     int i;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     for(i=pWindowInfo->childWindowInfos.size()-1;i>=0;i--){
         if(pWindowInfo->childWindowInfos[i]->Control==CT_COMBOBOX&&
-            (pWindowInfo->childWindowInfos[i]->style&0x000F)!=CBS_SIMPLE){
+            (pWindowInfo->childWindowInfos[i]->GetStyle()&0x000F)!=CBS_SIMPLE){
             //コンボ ボックスの場合は表示部分をターゲットに選択する（高さ20pixel）
             if(x>=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&&
@@ -676 +675 @@
     RECT rect;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]=-1;
@@ -701 +700 @@
     RECT rect;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1){
@@ -762 +761 @@
     SIZE NeedSize;
 
-    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
 
     //必要な幅、高さを共に100ピクセル余裕を持たせる
@@ -817 +816 @@
                 i=GetWndNum(GetParent(hwnd));
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -897 +896 @@
                 i=GetWndNum(hParent);
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -966 +965 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"CommandButton","Button",WS_CHILD|WS_VISIBLE,0,CT_BUTTON,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "CommandButton",
+                            "Button",
+                            WS_CHILD|WS_VISIBLE,0,CT_BUTTON,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_CHECKBOX){
@@ -985 +996 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"CheckBox","Check",WS_CHILD|WS_VISIBLE|BS_AUTOCHECKBOX,0,CT_CHECKBOX,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "CheckBox",
+                            "Check",
+                            WS_CHILD|WS_VISIBLE|BS_AUTOCHECKBOX,
+                            0,
+                            CT_CHECKBOX,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_COMBOBOX){
@@ -1004 +1029 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ComboBox","",WS_CHILD|WS_VISIBLE|CBS_DROPDOWN|CBS_SORT|WS_VSCROLL,0,CT_COMBOBOX,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "ComboBox",
+                            "",
+                            WS_CHILD|WS_VISIBLE|CBS_DROPDOWN|CBS_SORT|WS_VSCROLL,
+                            0,
+                            CT_COMBOBOX,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_EDIT){
@@ -1023 +1062 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"EditBox","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_EDIT,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "EditBox",
+                            "",
+                            WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,
+                            CT_EDIT,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_GROUPBOX){
@@ -1042 +1094 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"GroupBox","Group",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,0,CT_GROUPBOX,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "GroupBox",
+                            "Group",
+                            WS_CHILD|WS_VISIBLE|BS_GROUPBOX,
+                            0,
+                            CT_GROUPBOX,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_HSCROLLBAR){
@@ -1061 +1127 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"HScrollBar","",WS_CHILD|WS_VISIBLE|SBS_HORZ,0,CT_HSCROLLBAR,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "HScrollBar",
+                            "",
+                            WS_CHILD|WS_VISIBLE|SBS_HORZ,
+                            0,
+                            CT_HSCROLLBAR,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_IMAGEBOX){
@@ -1080 +1160 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ImageBox","",WS_CHILD|WS_VISIBLE|SS_BLACKFRAME,0,CT_IMAGEBOX,IMGTYPE_FILE,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "ImageBox",
+                            "",
+                            WS_CHILD|WS_VISIBLE|SS_BLACKFRAME,0,CT_IMAGEBOX,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTBOX){
@@ -1099 +1191 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ListBox","",WS_CHILD|WS_VISIBLE|WS_VSCROLL|LBS_SORT|LBS_NOTIFY,WS_EX_CLIENTEDGE,CT_LISTBOX,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "ListBox",
+                            "",
+                            WS_CHILD|WS_VISIBLE|WS_VSCROLL|LBS_SORT|LBS_NOTIFY,WS_EX_CLIENTEDGE,
+                            CT_LISTBOX,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTVIEW){
@@ -1118 +1223 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ListView","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_LISTVIEW,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "ListView",
+                            "",
+                            WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,
+                            CT_LISTVIEW,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_PROGRESSBAR){
@@ -1137 +1255 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ProgressBar","",WS_CHILD|WS_VISIBLE,WS_EX_STATICEDGE,CT_PROGRESSBAR,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "ProgressBar",
+                            "",
+                            WS_CHILD|WS_VISIBLE,WS_EX_STATICEDGE,
+                            CT_PROGRESSBAR,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_RADIOBUTTON){
@@ -1156 +1287 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"RadioButton","radio",WS_CHILD|WS_VISIBLE|BS_AUTORADIOBUTTON,0,CT_RADIOBUTTON,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "RadioButton",
+                            "radio",
+                            WS_CHILD|WS_VISIBLE|BS_AUTORADIOBUTTON,
+                            0,
+                            CT_RADIOBUTTON,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_STATIC){
@@ -1175 +1320 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"Static","Text",WS_CHILD|WS_VISIBLE,0,CT_STATIC,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "Static",
+                            "Text",
+                            WS_CHILD|WS_VISIBLE,
+                            0,
+                            CT_STATIC,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TRACKBAR){
@@ -1194 +1353 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"TrackBar","",WS_CHILD|WS_VISIBLE|TBS_BOTH|TBS_NOTICKS,0,CT_TRACKBAR,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "TrackBar",
+                            "",
+                            WS_CHILD|WS_VISIBLE|TBS_BOTH|TBS_NOTICKS,
+                            0,
+                            CT_TRACKBAR,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TREEVIEW){
@@ -1213 +1386 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"TreeView","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_TREEVIEW,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "TreeView",
+                            "",
+                            WS_CHILD|WS_VISIBLE,
+                            WS_EX_CLIENTEDGE,
+                            CT_TREEVIEW,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_UPDOWN){
@@ -1232 +1419 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"UpDown","",WS_CHILD|WS_VISIBLE,0,CT_UPDOWN,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "UpDown",
+                            "",
+                            WS_CHILD|WS_VISIBLE,
+                            0,
+                            CT_UPDOWN,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_VSCROLLBAR){
@@ -1251 +1452 @@
                         size.cx=rect.right-rect.left;
                         size.cy=rect.bottom-rect.top;
-                        MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"VScrollBar","",WS_CHILD|WS_VISIBLE|SBS_VERT,0,CT_VSCROLLBAR,0,0,1);
+                        MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem(
+                            i,
+                            i2,
+                            -1,
+                            &pos,
+                            &size,
+                            "VScrollBar",
+                            "",
+                            WS_CHILD|WS_VISIBLE|SBS_VERT,
+                            0,
+                            CT_VSCROLLBAR,
+                            ActiveBasic::PM::ImageReferenceType::File,
+                            0,
+                            1
+                        );
                     }
                     SendMessage(GetWindow(MdiInfo[i].MdiRadInfo->hTools,GW_CHILD),WM_COMMAND,IDC_TOOL_MOUSE,0);
@@ -1275 +1490 @@
                 i=GetWndNum(hParent);
                 i2 = GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
@@ -1440 +1655 @@
                 i=GetWndNum(hParent);
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){
                     if(MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){
@@ -1452 +1667 @@
                             sprintf(temporary,"%s_%s_Click",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()
                             );
                         }
@@ -1459 +1674 @@
                             sprintf(temporary,"%s_%s_EditChange",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
                         }
                         else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT)
@@ -1465 +1680 @@
                             sprintf(temporary,"%s_%s_Change",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
                         }
                         else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX)
@@ -1471 +1686 @@
                             sprintf(temporary,"%s_%s_SelChange",
                                 pWindowInfo->GetName().c_str(),
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
                         }
                         else temporary[0]=0;
@@ -1483 +1698 @@
                 hParent=GetParent(hwnd);
                 i=GetWndNum(hParent);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::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

@@ -40 +40 @@
     HFONT *lphFont;
     HANDLE *lphImage;
-    int i2,i3;
+    int i2;
     char temporary[MAX_PATH];
 
@@ -50 +50 @@
     }
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
-
-    if(pWindowInfo->style&WS_CHILD){
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+
+    if(pWindowInfo->GetStyle()&WS_CHILD){
         //"チャイルドウィンドウをテスト表示することはできません"
         MessageBox(hOwner,STRING_RAD_ERROR_CANT_CHILDTEST,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
@@ -64 +64 @@
 
     //テスト用のメインウィンドウを作成
-    hWnd=CreateWindowEx(pWindowInfo->ExStyle,
+    hWnd=CreateWindowEx(pWindowInfo->GetExStyle(),
         "TestWindow",
         pWindowInfo->GetName().c_str(),
-        pWindowInfo->style|WS_VISIBLE,
+        pWindowInfo->GetStyle()|WS_VISIBLE,
         CW_USEDEFAULT,CW_USEDEFAULT,
         pWindowInfo->size.cx,pWindowInfo->size.cy,
@@ -73 +73 @@
 
     //子ウィンドウ作成
-    for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){
+    for( i2=0; i2<static_cast<int>(pWindowInfo->childWindowInfos.size()); i2++ )
+    {
         if(pWindowInfo->childWindowInfos[i2]->Control==CT_UPDOWN){
             CreateUpDownControl(
-                pWindowInfo->childWindowInfos[i2]->style,
+                pWindowInfo->childWindowInfos[i2]->GetStyle(),
                 pWindowInfo->childWindowInfos[i2]->pos.x,pWindowInfo->childWindowInfos[i2]->pos.y,
                 pWindowInfo->childWindowInfos[i2]->size.cx,pWindowInfo->childWindowInfos[i2]->size.cy,
@@ -85 +86 @@
             GetItemClassName(temporary,pWindowInfo->childWindowInfos[i2]->Control);
             hChild=CreateWindowEx(
-                pWindowInfo->childWindowInfos[i2]->ExStyle,
+                pWindowInfo->childWindowInfos[i2]->GetExStyle(),
                 temporary,
-                pWindowInfo->childWindowInfos[i2]->caption,
-                pWindowInfo->childWindowInfos[i2]->style,
+                pWindowInfo->childWindowInfos[i2]->GetCaption().c_str(),
+                pWindowInfo->childWindowInfos[i2]->GetStyle(),
                 pWindowInfo->childWindowInfos[i2]->pos.x,
                 pWindowInfo->childWindowInfos[i2]->pos.y,
@@ -102 +103 @@
                 // イメージ ボックスの場合
                 ///////////////////////////
-                if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_ICON){
-                    if(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.type==IMGTYPE_FILE)
-                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path);
-                    else{
-                        for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++)
+                if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_ICON){
+                    if(pWindowInfo->childWindowInfos[i2]->image.IsFile())
+                    {
+                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->image.path.c_str());
+                    }
+                    else
+                    {
+                        temporary[0] = 0;
+                        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
                         {
-                            if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path )
+                            if( resourceItem.idName == pWindowInfo->childWindowInfos[i2]->image.path )
                             {
+                                lstrcpy( temporary, resourceItem.filepath.c_str() );
                                 break;
                             }
                         }
-                        if(i3==projectInfo.resourceManager.iconResources.size()) temporary[0]=0;
-                        else lstrcpy(temporary,projectInfo.resourceManager.iconResources[i3].filepath.c_str());
                     }
                     if(temporary[0]){
@@ -123 +127 @@
                     }
                 }
-                else if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_BITMAP){
-                    if(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.type==IMGTYPE_FILE)
-                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path);
-                    else{
-                        for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++){
-                            if( projectInfo.resourceManager.bitmapResources[i3].idName == pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path )
+                else if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_BITMAP){
+                    if(pWindowInfo->childWindowInfos[i2]->image.IsFile())
+                    {
+                        lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->image.path.c_str());
+                    }
+                    else
+                    {
+                        temporary[0] = 0;
+                        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+                        {
+                            if( resourceItem.idName == pWindowInfo->childWindowInfos[i2]->image.path )
                             {
+                                lstrcpy( temporary, resourceItem.filepath.c_str() );
                                 break;
                             }
                         }
-                        if(i3==projectInfo.resourceManager.bitmapResources.size()) temporary[0]=0;
-                        else lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i3].filepath.c_str());
                     }
                     if(temporary[0]){
@@ -155 +163 @@
 
     //フォントハンドルを破棄
-    for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){
+    for(i2=0;i2<static_cast<int>(pWindowInfo->childWindowInfos.size());i2++){
         if(lphFont[i2]) DeleteObject(lphFont[i2]);
     }
@@ -161 +169 @@
 
     //イメージハンドルを破棄
-    for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){
+    for(i2=0;i2<static_cast<int>(pWindowInfo->childWindowInfos.size());i2++){
         if(lphImage[i2]){
-            if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_ICON)
+            if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_ICON)
                 DestroyIcon((HICON)lphImage[i2]);
-            else if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_BITMAP)
+            else if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_BITMAP)
                 DeleteObject(lphImage[i2]);
         }
@@ -176 +184 @@
 }
 
-void SetSupportDlgData(int WndNum, const WindowInfo &windowInfo )
+void SetSupportDlgData(int WndNum, const ActiveBasic::PM::WindowInfo &windowInfo )
 {
     ////////////////////////////////////
@@ -307 +315 @@
 
             i=GetWndNum(GetParent(hwnd));
-            WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+            ActiveBasic::PM::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));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 sprintf(temporary,"h%s",pWindowInfo->GetName().c_str());
                 sprintf(temp2,"%sProc",pWindowInfo->GetName().c_str());
@@ -394 +394 @@
 
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         RAD_UNDOSTATE_NAME names,NoticeNames;
@@ -481 +481 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                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);
-                if(pWindowInfo->ExStyle&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->ExStyle&WS_EX_TOOLWINDOW) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOOLWINDOW,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->ExStyle&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->ExStyle&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->ExStyle&WS_EX_NOPARENTNOTIFY) SendDlgItemMessage(hwnd,IDC_EXSTYLE_NOPARENTNOTIFY,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->ExStyle&WS_EX_CONTEXTHELP) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTEXTHELP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->ExStyle&WS_EX_CONTROLPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTROLPARENT,BM_SETCHECK,BST_CHECKED,0);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                if(pWindowInfo->GetExStyle()&WS_EX_TOPMOST) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOPMOST,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_TOOLWINDOW) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOOLWINDOW,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_NOPARENTNOTIFY) SendDlgItemMessage(hwnd,IDC_EXSTYLE_NOPARENTNOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_CONTEXTHELP) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTEXTHELP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetExStyle()&WS_EX_CONTROLPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTROLPARENT,BM_SETCHECK,BST_CHECKED,0);
                 break;
             }
@@ -520 +520 @@
                             style|=WS_EX_CONTROLPARENT;
 
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                        if(style==pWindowInfo->ExStyle){
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                        if(style==pWindowInfo->GetExStyle()){
                             SendMessage(hwnd,WM_COMMAND,IDCANCEL,0);
                             return 1;
@@ -528 +528 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,SELECT_WINDOW,pWindowInfo->ExStyle);
-
-                        pWindowInfo->ExStyle=style;
+                        Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,SELECT_WINDOW,pWindowInfo->GetExStyle());
+
+                        pWindowInfo->SetExStyle( style );
                         EndDialog(hwnd,1);
                         return 1;
@@ -553 +553 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str());
                 SetDlgItemText(hwnd,IDC_HANDLE,pWindowInfo->GetHandleName().c_str());
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->caption);
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str());
 
                 //"3D FACE（標準）"
@@ -564 +564 @@
                 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_BGCOLOR2);
 
-                for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++)
-                    SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
+                BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+                {
+                    SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)resourceItem.idName.c_str());
+                }
                 if(pWindowInfo->type==WNDTYPE_MODALDLG||
                     pWindowInfo->type==WNDTYPE_MODELESSDLG){
@@ -572 +574 @@
                 }
                 else{
-                    if(pWindowInfo->bgColor==COLOR_3DFACE){
+                    if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE){
                         //3DFACE
                         SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,0,0);
                     }
-                    else if(pWindowInfo->bgColor<=0){
+                    else if(pWindowInfo->GetBackgroundColor()<=0){
                         //色指定
                         SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,1,0);
                     }
-                    else if(pWindowInfo->bgColor>=0x1000){
+                    else if(pWindowInfo->GetBackgroundColor()>=0x1000){
                         //ビットマップ指定
-                        SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo->bgColor-0x1000,0);
+                        SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo->GetBackgroundColor()-0x1000,0);
                     }
                 }
@@ -595 +597 @@
 
                 for(i3=0,i4=0;i3<projectInfo.NumberOfMenu;i3++){
-                    if(pWindowInfo->MenuID){
-                        if(lstrcmpi(projectInfo.pMenuInfo[i3].IdName,pWindowInfo->MenuID)==0)
+                    if( pWindowInfo->HasMenu() )
+                    {
+                        if(lstrcmpi(projectInfo.pMenuInfo[i3].IdName,pWindowInfo->GetMenuIdName().c_str())==0)
                             i4=i3+1;
                     }
                     SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,(long)projectInfo.pMenuInfo[i3].IdName);
                 }
-                if(i4==0&&pWindowInfo->MenuID){
+                if(i4==0&&pWindowInfo->HasMenu()){
                     //メニューが存在しない場合、無効にする
-                    HeapDefaultFree(pWindowInfo->MenuID);
-                    pWindowInfo->MenuID=0;
+                    pWindowInfo->SetMenuIdName( "" );
                     DrawRadWindow(i,pWindowInfo);
                 }
@@ -617 +619 @@
                 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_ICONDEFAULT);
 
-                for(i3=0,i4=0;i3<projectInfo.resourceManager.iconResources.size();i3++){
+                for(i3=0,i4=0;i3<static_cast<int>(projectInfo.resourceManager.iconResources.size());i3++){
                     SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
 
-                    if( pWindowInfo->IconResName )
+                    if( pWindowInfo->HasIcon() )
                     {
-                        if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->IconResName )
+                        if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->GetIconResourceName() )
                         {
                             i4=i3+1;
@@ -628 +630 @@
                     }
                 }
-                if(i4==0&&pWindowInfo->IconResName){
+                if( i4 == 0 && pWindowInfo->HasIcon() )
+                {
                     //アイコンが存在しない場合、無効にする
-                    HeapDefaultFree(pWindowInfo->IconResName);
-                    pWindowInfo->IconResName=0;
+                    pWindowInfo->SetIconResourceName( "" );
                     DrawRadWindow(i,pWindowInfo);
                 }
@@ -648 +650 @@
                 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_STYLE_CHILD);
 
-                if(pWindowInfo->style&WS_POPUP) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->style&WS_CHILD) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,2,0);
+                if(pWindowInfo->GetStyle()&WS_POPUP) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->GetStyle()&WS_CHILD) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,0,0);
 
@@ -660 +662 @@
 
                 //WS_CAPTION（WS_BORDER含む）を考慮してWS_THICKFRAMEを最初に比較する
-                if(pWindowInfo->style&WS_THICKFRAME) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,2,0);
-                else if(pWindowInfo->style&WS_BORDER) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,1,0);
+                if(pWindowInfo->GetStyle()&WS_THICKFRAME) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,2,0);
+                else if(pWindowInfo->GetStyle()&WS_BORDER) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,1,0);
                 else SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->style&WS_CAPTION) SendDlgItemMessage(hwnd,IDC_STYLE_CAPTION,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_SYSMENU) SendDlgItemMessage(hwnd,IDC_STYLE_SYSMENU,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_MINIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZEBOX,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_MAXIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZEBOX,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_MINIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_MAXIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLLBAR,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLLBAR,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_CLIPSIBLINGS) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPSIBLINGS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_CLIPCHILDREN) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPCHILDREN,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_CAPTION) SendDlgItemMessage(hwnd,IDC_STYLE_CAPTION,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_SYSMENU) SendDlgItemMessage(hwnd,IDC_STYLE_SYSMENU,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_MINIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZEBOX,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_MAXIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZEBOX,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_MINIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_MAXIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLLBAR,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLLBAR,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_CLIPSIBLINGS) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPSIBLINGS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_CLIPCHILDREN) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPCHILDREN,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
 
                 SetDlgItemText(hwnd,IDC_SETFONT,pWindowInfo->LogFont.lfFaceName);
 
-                RadProperty_Window_Window_StylingOrder(hwnd,&pWindowInfo->style);
+                DWORD tempStyle = pWindowInfo->GetStyle();
+                RadProperty_Window_Window_StylingOrder(hwnd,&tempStyle);
+                pWindowInfo->SetStyle( tempStyle );
 
 
@@ -706 +710 @@
                         if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,(DLGPROC)DlgRadProperty_Window_Rename)) return 1;
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                         SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str());
                         SetDlgItemText(hwnd,IDC_HANDLE,pWindowInfo->GetHandleName().c_str());
@@ -715 +719 @@
                         if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1;
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                        SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->caption);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str());
                         return 1;
                     }
@@ -722 +726 @@
                     {
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                         LOGFONT lf;
                         lf=pWindowInfo->LogFont;
@@ -737 +741 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         i3=SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_GETCURSEL,0,0);
@@ -744 +748 @@
 
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->bgColor);
-
-                            pWindowInfo->bgColor=COLOR_3DFACE;
+                            Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->GetBackgroundColor());
+
+                            pWindowInfo->SetBackgroundColor( COLOR_3DFACE );
                         }
                         else if(i3==1){
@@ -770 +774 @@
                             cc.lStructSize=sizeof(CHOOSECOLOR);
                             cc.hwndOwner=hwnd;
-                            if(pWindowInfo->bgColor<=0)
-                                cc.rgbResult=-pWindowInfo->bgColor;
+                            if(pWindowInfo->GetBackgroundColor()<=0)
+                                cc.rgbResult=-pWindowInfo->GetBackgroundColor();
                             else cc.rgbResult=RGB(255,255,255);
                             cc.lpCustColors=CusColors;
@@ -777 +781 @@
                             if(!ChooseColor(&cc)){
                                 //キャンセル動作
-                                if(pWindowInfo->bgColor==COLOR_3DFACE){
+                                if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE){
                                     //3DFACE
                                     SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,0,0);
                                 }
-                                else if(pWindowInfo->bgColor<=0){
+                                else if(pWindowInfo->GetBackgroundColor()<=0){
                                     //色指定
                                     SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,1,0);
                                 }
-                                else if(pWindowInfo->bgColor>=0x1000){
+                                else if(pWindowInfo->GetBackgroundColor()>=0x1000){
                                     //ビットマップ指定
-                                    SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo->bgColor-0x1000,0);
+                                    SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo->GetBackgroundColor()-0x1000,0);
                                 }
                                 return 1;
@@ -793 +797 @@
 
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->bgColor);
-
-                            pWindowInfo->bgColor=-(int)cc.rgbResult;
+                            Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->GetBackgroundColor());
+
+                            pWindowInfo->SetBackgroundColor( -(int)cc.rgbResult );
                         }
                         else{
@@ -802 +806 @@
 
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->bgColor);
-
-                            pWindowInfo->bgColor=0x1000+i3;
+                            Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->GetBackgroundColor());
+
+                            pWindowInfo->SetBackgroundColor( 0x1000+i3 );
                         }
                         DrawRadWindow(i,pWindowInfo);
@@ -813 +817 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_WINDOWMENU,SELECT_WINDOW,(long)pWindowInfo->MenuID);
+                        Rad_NoticeChanging(i,RAD_UNDO_WINDOWMENU,SELECT_WINDOW,(DWORD)&pWindowInfo->GetMenuIdName());
 
                         i3=SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETCURSEL,0,0);
-                        if(pWindowInfo->MenuID)
-                            HeapDefaultFree(pWindowInfo->MenuID);
-                        if(i3==0) pWindowInfo->MenuID=0;
-                        else{
-                            pWindowInfo->MenuID=(char *)HeapAlloc(hHeap,0,SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXTLEN,i3,0)+1);
-                            SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXT,i3,(long)pWindowInfo->MenuID);
+
+                        if(i3==0)
+                        {
+                            pWindowInfo->SetMenuIdName( "" );
+                        }
+                        else
+                        {
+                            char temporary[1024];
+                            SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXT,i3,(long)temporary);
+                            pWindowInfo->SetMenuIdName( temporary );
                         }
                         DrawRadWindow(i,pWindowInfo);
@@ -833 +841 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_ICONRES,SELECT_WINDOW,(long)pWindowInfo->IconResName);
+                        Rad_NoticeChanging(i,RAD_UNDO_ICONRES,SELECT_WINDOW,(DWORD)&pWindowInfo->GetIconResourceName());
 
                         i3=SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETCURSEL,0,0);
-                        if(pWindowInfo->IconResName)
-                            HeapDefaultFree(pWindowInfo->IconResName);
-                        if(i3==0) pWindowInfo->IconResName=0;
-                        else{
-                            pWindowInfo->IconResName=(char *)HeapAlloc(hHeap,0,SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXTLEN,i3,0)+1);
-                            SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXT,i3,(long)pWindowInfo->IconResName);
+                        if(i3==0)
+                        {
+                            pWindowInfo->SetIconResourceName( "" );
+                        }
+                        else
+                        {
+                            char temporary[1024];
+                            SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXT,i3,(long)temporary);
+                            pWindowInfo->SetIconResourceName( temporary );
                         }
                         DrawRadWindow(i,pWindowInfo);
@@ -854 +865 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         i3=SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_GETCURSEL,0,0);
-                        pWindowInfo->style&=0x3FFFFFFF;
-                        if(i3==1) pWindowInfo->style|=WS_POPUP;
-                        else if(i3==2) pWindowInfo->style|=WS_CHILD;
-                        RadProperty_Window_Window_StylingOrder(hwnd,&pWindowInfo->style);
+                        pWindowInfo->SetStyle( pWindowInfo->GetStyle() & 0x3FFFFFFF );
+                        if(i3==1) pWindowInfo->AddStyle( WS_POPUP );
+                        else if(i3==2) pWindowInfo->AddStyle( WS_CHILD );
+
+                        DWORD tempStyle = pWindowInfo->GetStyle();
+                        RadProperty_Window_Window_StylingOrder(hwnd,&tempStyle);
+                        pWindowInfo->SetStyle( tempStyle );
+
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -871 +886 @@
                     if(HIWORD(wParam)==CBN_SELCHANGE){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         i3=SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_GETCURSEL,0,0);
-                        pWindowInfo->style&=~(WS_BORDER|WS_THICKFRAME);
-                        if(i3==1) pWindowInfo->style|=WS_BORDER;
+                        pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~(WS_BORDER|WS_THICKFRAME) );
+                        if(i3==1) pWindowInfo->AddStyle( WS_BORDER );
                         else if(i3==2){
-                            pWindowInfo->style|=WS_BORDER;
-                            pWindowInfo->style|=WS_THICKFRAME;
-                        }
-                        RadProperty_Window_Border_StylingOrder(hwnd,&pWindowInfo->style);
+                            pWindowInfo->AddStyle( WS_BORDER );
+                            pWindowInfo->AddStyle( WS_THICKFRAME );
+                        }
+                        DWORD tempStyle = pWindowInfo->GetStyle();
+                        RadProperty_Window_Border_StylingOrder(hwnd,&tempStyle);
+                        pWindowInfo->SetStyle( tempStyle );
+
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -892 +910 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_CAPTION,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_CAPTION;
+                            pWindowInfo->AddStyle( WS_CAPTION );
                         else
-                            pWindowInfo->style&=~WS_CAPTION;
-                        RadProperty_Window_Caption_StylingOrder(hwnd,&pWindowInfo->style);
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_CAPTION );
+                        DWORD tempStyle = pWindowInfo->GetStyle();
+                        RadProperty_Window_Caption_StylingOrder(hwnd,&tempStyle);
+                        pWindowInfo->SetStyle( tempStyle );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -909 +929 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_SYSMENU,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_SYSMENU;
+                            pWindowInfo->AddStyle( WS_SYSMENU );
                         else
-                            pWindowInfo->style&=~WS_SYSMENU;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_SYSMENU );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -925 +945 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZEBOX,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_MINIMIZEBOX;
+                            pWindowInfo->AddStyle( WS_MINIMIZEBOX );
                         else
-                            pWindowInfo->style&=~WS_MINIMIZEBOX;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MINIMIZEBOX );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -941 +961 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZEBOX,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_MAXIMIZEBOX;
+                            pWindowInfo->AddStyle( WS_MAXIMIZEBOX );
                         else
-                            pWindowInfo->style&=~WS_MAXIMIZEBOX;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MAXIMIZEBOX );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -957 +977 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZE,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_MINIMIZE;
+                            pWindowInfo->AddStyle( WS_MINIMIZE );
                         else
-                            pWindowInfo->style&=~WS_MINIMIZE;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MINIMIZE );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -973 +993 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZE,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_MAXIMIZE;
+                            pWindowInfo->AddStyle( WS_MAXIMIZE );
                         else
-                            pWindowInfo->style&=~WS_MAXIMIZE;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MAXIMIZE );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -988 +1008 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLLBAR,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_HSCROLL;
+                            pWindowInfo->AddStyle( WS_HSCROLL );
                         else
-                            pWindowInfo->style&=~WS_HSCROLL;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_HSCROLL );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -1003 +1023 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLLBAR,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_VSCROLL;
+                            pWindowInfo->AddStyle( WS_VSCROLL );
                         else
-                            pWindowInfo->style&=~WS_VSCROLL;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_VSCROLL );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -1019 +1039 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_DISABLED;
+                            pWindowInfo->AddStyle( WS_DISABLED );
                         else
-                            pWindowInfo->style&=~WS_DISABLED;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_DISABLED );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -1035 +1055 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_CLIPSIBLINGS,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_CLIPSIBLINGS;
+                            pWindowInfo->AddStyle( WS_CLIPSIBLINGS );
                         else
-                            pWindowInfo->style&=~WS_CLIPSIBLINGS;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_CLIPSIBLINGS );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -1051 +1071 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_CLIPCHILDREN,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_CLIPCHILDREN;
+                            pWindowInfo->AddStyle( WS_CLIPCHILDREN );
                         else
-                            pWindowInfo->style&=~WS_CLIPCHILDREN;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_CLIPCHILDREN );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -1067 +1087 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->style);
+                        Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle());
 
                         if(SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_GETCHECK,0,0))
-                            pWindowInfo->style|=WS_VISIBLE;
+                            pWindowInfo->AddStyle( WS_VISIBLE );
                         else
-                            pWindowInfo->style&=~WS_VISIBLE;
+                            pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_VISIBLE );
                         DrawRadWindow(i,pWindowInfo);
                         return 1;
@@ -1092 +1112 @@
                     if(HIWORD(wParam)==BN_CLICKED){
                         i=GetWndNum(GetParent(GetParent(hwnd)));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         //変更情報
@@ -1124 +1144 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
                 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                    SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->caption);
+                    SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str());
                 else
-                    SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                    SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
                 break;
             }
@@ -1136 +1156 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_CAPTION))+1;
@@ -1142 +1162 @@
                         GetDlgItemText(hwnd,IDC_CAPTION,temporary,i3);
                         if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
-                            if(lstrcmp(temporary,pWindowInfo->caption)==0){
+                            if( pWindowInfo->GetCaption() == temporary){
                                 HeapDefaultFree(temporary);
                                 SendMessage(hwnd,WM_COMMAND,IDCANCEL,0);
@@ -1149 +1169 @@
 
                             //変更情報を更新
-                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)pWindowInfo->caption);
-
-                            HeapDefaultFree(pWindowInfo->caption);
-                            pWindowInfo->caption=temporary;
+                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->GetCaption());
+
+                            pWindowInfo->SetCaption( temporary );
                         }
                         else{
-                            if(lstrcmp(temporary,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption)==0){
+                            if( pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption() == temporary )
+                            {
                                 HeapDefaultFree(temporary);
                                 SendMessage(hwnd,WM_COMMAND,IDCANCEL,0);
@@ -1162 +1182 @@
 
                             //変更情報を更新
-                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
-
-                            HeapDefaultFree(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption=temporary;
+                            Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption());
+
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetCaption( temporary );
 
                             if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC){
@@ -1233 +1252 @@
                         DrawRadWindow(i,pWindowInfo);
                         EndDialog(hwnd,1);
+
+                        HeapDefaultFree(temporary);
                         return 1;
                     }
@@ -1255 +1276 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
             }
             break;
@@ -1264 +1285 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_IDNAME))+1;
@@ -1274 +1295 @@
                         temporary=(char *)HeapAlloc(hHeap,0,i3);
                         GetDlgItemText(hwnd,IDC_IDNAME,temporary,i3);
-                        if(lstrcmp(temporary,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName)==0){
+                        if( pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName() == temporary )
+                        {
                             HeapDefaultFree(temporary);
                             SendMessage(hwnd,WM_COMMAND,IDCANCEL,0);
@@ -1284 +1306 @@
 
                         //変更情報を更新
-                        Rad_NoticeChanging(i,RAD_UNDO_NAME,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-
-                        HeapDefaultFree(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName=temporary;
+                        Rad_NoticeChanging(i,RAD_UNDO_NAME,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName());
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetName( temporary );
 
                         EndDialog(hwnd,1);
@@ -1304 +1325 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     switch(LOWORD(wParam)){
         case IDC_RENAMEID:
             if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd,(DLGPROC)DlgRadProperty_Item_RenameID)) return 1;
-            SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->IdName);
+            SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
             return 1;
         case IDC_RENAMECAPTION:
             if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1;
-            SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->caption);
+            SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
             return 1;
         case IDC_STYLE_DISABLED:
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style);
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style|=WS_DISABLED;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_DISABLED );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style&=~WS_DISABLED;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_DISABLED );
                 DrawRadWindow(WndNum,pWindowInfo);
                 return 1;
@@ -1331 +1352 @@
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style);
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style|=WS_VISIBLE;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VISIBLE );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style&=~WS_VISIBLE;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VISIBLE );
                 return 1;
             }
@@ -1343 +1364 @@
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style);
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style|=WS_GROUP;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_GROUP );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style&=~WS_GROUP;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_GROUP );
                 return 1;
             }
@@ -1355 +1376 @@
             if(HIWORD(wParam)==BN_CLICKED){
                 //変更情報
-                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style);
+                Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                 if(SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_GETCHECK,0,0))
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style|=WS_TABSTOP;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_TABSTOP );
                 else
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->style&=~WS_TABSTOP;
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_TABSTOP );
                 return 1;
             }
@@ -1376 +1397 @@
                 SetPosCenter(hwnd);
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle&WS_EX_DLGMODALFRAME) SendDlgItemMessage(hwnd,IDC_EXSTYLE_DLGMODALFRAME,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_DLGMODALFRAME) SendDlgItemMessage(hwnd,IDC_EXSTYLE_DLGMODALFRAME,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);
                 break;
             }
@@ -1389 +1410 @@
                     {
                         i=GetWndNum(GetWindow(hClient,GW_CHILD));
-                        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                         DWORD style;
@@ -1404 +1425 @@
                             style|=WS_EX_STATICEDGE;
 
-                        if(style==pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle){
+                        if(style==pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()){
                             SendMessage(hwnd,WM_COMMAND,IDCANCEL,0);
                             return 1;
@@ -1410 +1431 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle);
-
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ExStyle=style;
+                        Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle());
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetExStyle( style );
                         EndDialog(hwnd,1);
                         return 1;
@@ -1439 +1460 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -1448 +1469 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_OWNERDRAW)==BS_OWNERDRAW) SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_CHECKED,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_DEFPUSHBUTTON) SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_OWNERDRAW)==BS_OWNERDRAW) SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_CHECKED,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_DEFPUSHBUTTON) SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -1476 +1497 @@
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0);
 
@@ -1496 +1517 @@
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0);
 
@@ -1510 +1531 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
+                ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
 
                 //共通スタイル
@@ -1521 +1542 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_OWNERDRAW;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_DEFPUSHBUTTON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_DEFPUSHBUTTON );
                                 SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_DEFPUSHBUTTON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1537 +1558 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_DEFPUSHBUTTON;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_OWNERDRAW;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_OWNERDRAW );
                                 SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_OWNERDRAW;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1553 +1574 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_ICON;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_BITMAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                                 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_ICON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1569 +1590 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_BITMAP;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_ICON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                                 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_BITMAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1585 +1606 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_MULTILINE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_MULTILINE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1598 +1619 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_NOTIFY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_NOTIFY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -1611 +1632 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(BS_LEFT|BS_RIGHT|BS_CENTER);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_LEFT;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_RIGHT;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_CENTER;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1625 +1646 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(BS_TOP|BS_BOTTOM|BS_VCENTER);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_TOP;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_BOTTOM;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_VCENTER;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1661 +1682 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -1670 +1691 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_AUTOCHECKBOX)==BS_AUTOCHECKBOX) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_AUTO3STATE)==BS_AUTO3STATE){
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTOCHECKBOX)==BS_AUTOCHECKBOX) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTO3STATE)==BS_AUTO3STATE){
                     SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
                     SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0);
                 }
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_3STATE)==BS_3STATE) SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_3STATE)==BS_3STATE) SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -1703 +1724 @@
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0);
 
@@ -1723 +1744 @@
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0);
 
@@ -1737 +1758 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
+                ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
 
                 //共通スタイル
@@ -1748 +1769 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_GETCHECK,0,0)){
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x04){
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){
                                     //3state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_AUTO3STATE;
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE );
                                 }
                                 else{
                                     //2state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_AUTOCHECKBOX;
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX );
                                 }
                             }
                             else{
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x04){
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){
                                     //3state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_3STATE;
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE );
                                 }
                                 else{
                                     //2state
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_CHECKBOX;
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX );
                                 }
                             }
@@ -1780 +1801 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_GETCHECK,0,0)){
-                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0F)==BS_CHECKBOX){
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_3STATE;
+                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_CHECKBOX){
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE );
                                 }
-                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0F)==BS_AUTOCHECKBOX){
+                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTOCHECKBOX){
                                     //自動チェック
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_AUTO3STATE;
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE );
                                 }
                             }
                             else{
-                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0F)==BS_3STATE){
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_CHECKBOX;
+                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_3STATE){
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX );
                                 }
-                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0F)==BS_AUTO3STATE){
+                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTO3STATE){
                                     //自動チェック
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_AUTOCHECKBOX;
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                    pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX );
                                 }
                             }
@@ -1810 +1831 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_PUSHLIKE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_PUSHLIKE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_PUSHLIKE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_PUSHLIKE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1823 +1844 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_LEFTTEXT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_LEFTTEXT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFTTEXT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFTTEXT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1836 +1857 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_ICON;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_BITMAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                                 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_ICON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1852 +1873 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_BITMAP;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_ICON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                                 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_BITMAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1868 +1889 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_MULTILINE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_MULTILINE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1881 +1902 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_NOTIFY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_NOTIFY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -1894 +1915 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(BS_LEFT|BS_RIGHT|BS_CENTER);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_LEFT;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_RIGHT;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_CENTER;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1908 +1929 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(BS_TOP|BS_BOTTOM|BS_VCENTER);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_TOP;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_BOTTOM;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_VCENTER;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -1952 +1973 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -1961 +1982 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 ////////
@@ -1978 +1999 @@
 
                 //ビットを考慮してCBS_DROPDOWNLISTを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_DROPDOWNLIST)==CBS_DROPDOWNLIST) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,2,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_SIMPLE) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,0,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_DROPDOWN) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,1,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWNLIST)==CBS_DROPDOWNLIST) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,2,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SIMPLE) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,0,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWN) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,1,0);
 
 
@@ -1994 +2015 @@
                 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_OWNERDRAW_VARIABLE);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_SORT) SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_NOINTEGRALHEIGHT) SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_UPPERCASE) SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_LOWERCASE) SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
-
-                RadProperty_ComboBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SORT) SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_NOINTEGRALHEIGHT) SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_UPPERCASE) SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_LOWERCASE) SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
+
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                RadProperty_ComboBox_StylingOrder(hwnd,&tempStyle);
+                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
 
@@ -2019 +2042 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
+                ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];
 
                 //共通スタイル
@@ -2030 +2053 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_GETCURSEL,0,0);
                             //CBS_DROPDOWNLIST=CBS_SIMPLE | CBS_DROPDOWN
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(CBS_DROPDOWNLIST);
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_SIMPLE;
-                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_DROPDOWN;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_DROPDOWNLIST;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DROPDOWNLIST );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SIMPLE );
+                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWN );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWNLIST );
 
                             DrawRadWindow(i,pWindowInfo);
@@ -2046 +2069 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(CBS_OWNERDRAWFIXED|CBS_OWNERDRAWVARIABLE);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_OWNERDRAWFIXED;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_OWNERDRAWVARIABLE;
-
-                            RadProperty_ComboBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OWNERDRAWFIXED|CBS_OWNERDRAWVARIABLE );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWFIXED );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWVARIABLE );
+
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                            RadProperty_ComboBox_StylingOrder(hwnd,&tempStyle);
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             return 1;
                         }
@@ -2061 +2086 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_HASSTRINGS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_HASSTRINGS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_HASSTRINGS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_HASSTRINGS );
                             return 1;
                         }
@@ -2073 +2098 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_SORT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_SORT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SORT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_SORT );
                             return 1;
                         }
@@ -2085 +2110 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_NOINTEGRALHEIGHT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_NOINTEGRALHEIGHT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_NOINTEGRALHEIGHT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_NOINTEGRALHEIGHT );
                             return 1;
                         }
@@ -2097 +2122 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_OEMCONVERT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_OEMCONVERT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OEMCONVERT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OEMCONVERT );
                             return 1;
                         }
@@ -2109 +2134 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=WS_VSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~WS_VSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2122 +2147 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_AUTOHSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_AUTOHSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_AUTOHSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_AUTOHSCROLL );
                             return 1;
                         }
@@ -2134 +2159 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_DISABLENOSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_DISABLENOSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DISABLENOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DISABLENOSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2147 +2172 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_UPPERCASE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_UPPERCASE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_UPPERCASE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_UPPERCASE );
                             return 1;
                         }
@@ -2159 +2184 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_LOWERCASE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~CBS_LOWERCASE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_LOWERCASE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_LOWERCASE );
                             return 1;
                         }
@@ -2216 +2241 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -2226 +2251 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_MULTILINE) SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_NUMBER) SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_AUTOVSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_PASSWORD) SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_NOHIDESEL) SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_WANTRETURN) SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_UPPERCASE) SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_LOWERCASE) SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_READONLY) SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_MULTILINE) SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NUMBER) SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOVSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_PASSWORD) SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NOHIDESEL) SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_WANTRETURN) SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_UPPERCASE) SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_LOWERCASE) SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_READONLY) SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -2258 +2283 @@
 
                 //ビットを考慮してES_LEFTを最後に検討する
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_CENTER) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&ES_RIGHT) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_CENTER) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_RIGHT) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,0,0);
 
-                RadProperty_Edit_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                RadProperty_Edit_StylingOrder(hwnd,&tempStyle);
+                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
 
@@ -2273 +2300 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -2284 +2311 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_MULTILINE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_MULTILINE;
-                            RadProperty_Edit_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_MULTILINE );
+
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                            RadProperty_Edit_StylingOrder(hwnd,&tempStyle);
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2298 +2328 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_NUMBER;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_NUMBER;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NUMBER );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NUMBER );
                             return 1;
                         }
@@ -2310 +2340 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=WS_HSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~WS_HSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_HSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_HSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2323 +2353 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_AUTOHSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_AUTOHSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOHSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOHSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2336 +2366 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=WS_VSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~WS_VSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2349 +2379 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_AUTOVSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_AUTOVSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOVSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOVSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2362 +2392 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_PASSWORD;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_PASSWORD;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_PASSWORD );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_PASSWORD );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2375 +2405 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_NOHIDESEL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_NOHIDESEL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NOHIDESEL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NOHIDESEL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2388 +2418 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_OEMCONVERT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_OEMCONVERT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_OEMCONVERT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_OEMCONVERT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2401 +2431 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_WANTRETURN;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_WANTRETURN;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_WANTRETURN );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_WANTRETURN );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2414 +2444 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_LOWERCASE;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_UPPERCASE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_UPPERCASE );
                                 SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_UPPERCASE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2430 +2460 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_UPPERCASE;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_LOWERCASE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_LOWERCASE );
                                 SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_LOWERCASE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2446 +2476 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_READONLY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_READONLY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_READONLY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_READONLY );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2460 +2490 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_GETCURSEL,0,0);
                             //ES_LEFT=0
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(ES_CENTER|ES_RIGHT);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_CENTER;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_RIGHT;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_CENTER|ES_RIGHT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_CENTER );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_RIGHT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2497 +2527 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -2507 +2537 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -2527 +2557 @@
 
                 //ビットを考慮してBS_CENTERを最初に検討する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -2545 +2575 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -2556 +2586 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_GETCURSEL,0,0);
                             //BS_CENTER=BS_LEFT | BS_RIGHT
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(BS_CENTER);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_LEFT;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_RIGHT;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_CENTER;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2572 +2602 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_ICON;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_ICON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2585 +2615 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_BITMAP;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_BITMAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2598 +2628 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_NOTIFY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_NOTIFY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -2650 +2680 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -2659 +2689 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 //////////
@@ -2687 +2717 @@
                 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(long)STRING_IMAGEBOXPROP_STYLE_BITMAP);
 
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BLACKFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,0,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_GRAYFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,1,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_WHITEFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,2,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000001F)==SS_ETCHEDFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,3,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BLACKRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,4,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_GRAYRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,5,0);
-                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_WHITERECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,6,0);
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON||
-                    (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
-                    if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,7,0);
-                    else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,8,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,0,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,1,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITEFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,2,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000001F)==SS_ETCHEDFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,3,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,4,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,5,0);
+                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITERECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,6,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON||
+                    (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
+                    if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,7,0);
+                    else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,8,0);
 
                     //リソース／ファイル スイッチチェックを表示
@@ -2706 +2736 @@
                     ShowWindow(GetDlgItem(hwnd,IDC_IMAGE_SITUATION),SW_SHOW);
 
-                    if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type==IMGTYPE_FILE){
+                    if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
                         //ファイル指定を表示
                         ShowWindow(GetDlgItem(hwnd,IDC_PATH),SW_SHOW);
                         ShowWindow(GetDlgItem(hwnd,IDC_CHANGEPATH),SW_SHOW);
-                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path);
+                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
 
                         //イメージ状態テキスト
@@ -2718 +2748 @@
                         SendDlgItemMessage(hwnd,IDC_FILE,BM_SETCHECK,BST_CHECKED,0);
                     }
-                    else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type==IMGTYPE_RES){
+                    else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsResource()){
                         //リソース指定を表示
                         ShowWindow(GetDlgItem(hwnd,IDC_RESCOMBO),SW_SHOW);
@@ -2730 +2760 @@
                         SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_RESETCONTENT,0,0);
 
-                        if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON){
+                        if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
                             //アイコンリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++)
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
-                        }
-                        else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
+                            BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
+                            {
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)resourceItem.idName.c_str());
+                            }
+                        }
+                        else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                             //ビットマップリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++)
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
+                            BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+                            {
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)resourceItem.idName.c_str());
+                            }
                         }
 
                         //リストから選択
-                        i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_FINDSTRING,0,(long)pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path);
+                        i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_FINDSTRING,0,(long)pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
                         SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
                     }
                 }
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_CENTERIMAGE) SendDlgItemMessage(hwnd,IDC_SS_CENTERIMAGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_RIGHTJUST) SendDlgItemMessage(hwnd,IDC_SS_RIGHTJUST,BM_SETCHECK,BST_CHECKED,0);
-
-                RadProperty_ImageBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_CENTERIMAGE) SendDlgItemMessage(hwnd,IDC_SS_CENTERIMAGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_RIGHTJUST) SendDlgItemMessage(hwnd,IDC_SS_RIGHTJUST,BM_SETCHECK,BST_CHECKED,0);
+
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                RadProperty_ImageBox_StylingOrder(hwnd,&tempStyle);
+                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
                 bInitial=0;
@@ -2761 +2797 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -2772 +2808 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(0x0000001F);
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_BLACKFRAME;
-                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_GRAYFRAME;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_WHITEFRAME;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_ETCHEDFRAME;
-                            else if(i3==4) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_BLACKRECT;
-                            else if(i3==5) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_GRAYRECT;
-                            else if(i3==6) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_WHITERECT;
-                            else if(i3==7) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_ICON;
-                            else if(i3==8) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_BITMAP;
-
-                            if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON||
-                                (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( 0x0000001F );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BLACKFRAME );
+                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_GRAYFRAME );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_WHITEFRAME );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_ETCHEDFRAME );
+                            else if(i3==4) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BLACKRECT );
+                            else if(i3==5) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_GRAYRECT );
+                            else if(i3==6) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_WHITERECT );
+                            else if(i3==7) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_ICON );
+                            else if(i3==8) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_BITMAP );
+
+                            if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON||
+                                (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                                 //リソース／ファイル スイッチチェックを表示
                                 ShowWindow(GetDlgItem(hwnd,IDC_FILE),SW_SHOW);
@@ -2795 +2831 @@
                                 ShowWindow(GetDlgItem(hwnd,IDC_IMAGE_SITUATION),SW_SHOW);
 
-                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type==IMGTYPE_FILE){
+                                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
                                     //ファイル指定を表示
                                     ShowWindow(GetDlgItem(hwnd,IDC_PATH),SW_SHOW);
                                     ShowWindow(GetDlgItem(hwnd,IDC_CHANGEPATH),SW_SHOW);
-                                    SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path);
+                                    SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
 
                                     //イメージ状態テキスト
@@ -2807 +2843 @@
                                     SendDlgItemMessage(hwnd,IDC_FILE,BM_SETCHECK,BST_CHECKED,0);
                                 }
-                                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type==IMGTYPE_RES){
+                                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsResource()){
                                     //リソース指定を表示
                                     ShowWindow(GetDlgItem(hwnd,IDC_RESCOMBO),SW_SHOW);
@@ -2819 +2855 @@
                                     SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_RESETCONTENT,0,0);
 
-                                    if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON){
+                                    if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
                                         //アイコンリソースをコンボボックスに挿入
-                                        for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){
+                                        for(i3=0;i3<static_cast<int>(projectInfo.resourceManager.iconResources.size());i3++){
                                             SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
 
-                                            if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path )
+                                            if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path )
                                             {
                                                 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
@@ -2830 +2866 @@
                                         }
                                     }
-                                    else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
+                                    else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                                         //ビットマップリソースをコンボボックスに挿入
-                                        for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++){
+                                        for(i3=0;i3<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i3++){
                                             SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
 
-                                            if( projectInfo.resourceManager.bitmapResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path )
+                                            if( projectInfo.resourceManager.bitmapResources[i3].idName == pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path )
                                             {
                                                 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0);
@@ -2859 +2895 @@
                             }
 
-                            RadProperty_ImageBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                            RadProperty_ImageBox_StylingOrder(hwnd,&tempStyle);
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -2866 +2904 @@
 
                     case IDC_FILE:
-                        if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type==IMGTYPE_FILE){
+                        if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
                             //変更無し
                             break;
@@ -2872 +2910 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo);
-
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type=IMGTYPE_FILE;
+                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.type
+                            = ActiveBasic::PM::ImageReferenceType::File;
 
                         //ファイル指定を表示
                         ShowWindow(GetDlgItem(hwnd,IDC_PATH),SW_SHOW);
                         ShowWindow(GetDlgItem(hwnd,IDC_CHANGEPATH),SW_SHOW);
-                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path);
+                        SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str());
 
                         //リソース指定を非表示
@@ -2892 +2931 @@
 
                     case IDC_RESOURCE:
-                        if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type==IMGTYPE_RES){
+                        if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsResource()){
                             //変更無し
                             break;
@@ -2898 +2937 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo);
-
-                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type=IMGTYPE_RES;
+                        Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
+
+                        pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.type
+                            = ActiveBasic::PM::ImageReferenceType::Resource;
 
                         //ファイル指定を非表示
@@ -2917 +2957 @@
                         SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_RESETCONTENT,0,0);
 
-                        if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_ICON){
+                        if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON){
                             //アイコンリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++)
+                            BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources )
                             {
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str());
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)resourceItem.idName.c_str());
                             }
                         }
-                        else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x0000000F)==SS_BITMAP){
+                        else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){
                             //ビットマップリソースをコンボボックスに挿入
-                            for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++)
-                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str());
+                            BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources )
+                            {
+                                SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(long)resourceItem.idName.c_str());
+                            }
                         }
                         break;
@@ -2934 +2976 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo);
+                            Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
 
                             i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_GETCURSEL,0,0);
                             SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_GETLBTEXT,i3,(long)temporary);
 
-                            HeapDefaultFree(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-                            lstrcpy(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path,temporary);
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path = temporary;
 
                             DrawRadWindow(i,pWindowInfo);
@@ -2949 +2989 @@
                     case IDC_CHANGEPATH:
                         if(HIWORD(wParam)==BN_CLICKED){
-                            if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.type==IMGTYPE_FILE){
-                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x000F)==SS_ICON){
+                            if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){
+                                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_ICON){
                                     extern LPSTR IconFileFilter;
                                     //"アイコン ファイルを指定して下さい"
                                     if(!GetFilePathDialog(hwnd,temporary,IconFileFilter,STRING_IMAGEBOXPROP_GETPATH_ICON,1)) return 1;
                                 }
-                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&0x000F)==SS_BITMAP){
+                                else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_BITMAP){
                                     extern LPSTR BitmapFileFilter;
                                     //"ビットマップ ファイルを指定して下さい"
@@ -2962 +3002 @@
 
                                 //変更情報
-                                Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo);
+                                Rad_NoticeChanging(i,RAD_UNDO_IMAGESTATE,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image);
 
                                 lstrcpy( temporary, projectInfo.GetWorkDir().GetRelationalPath( temporary ).c_str() );
-                                HeapDefaultFree(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path);
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-                                lstrcpy(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->ImageCtrlInfo.path,temporary);
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path = temporary;
 
                                 SetDlgItemText(hwnd,IDC_PATH,temporary);
@@ -2979 +3017 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_NOTIFY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~SS_NOTIFY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOTIFY );
                             return 1;
                         }
@@ -2991 +3029 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_CENTERIMAGE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_CENTERIMAGE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~SS_CENTERIMAGE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_CENTERIMAGE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_CENTERIMAGE );
                             return 1;
                         }
@@ -3003 +3041 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_RIGHTJUST,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_RIGHTJUST;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~SS_RIGHTJUST;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_RIGHTJUST );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_RIGHTJUST );
                             return 1;
                         }
@@ -3037 +3075 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -3046 +3084 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 ////////
@@ -3065 +3103 @@
 
                 //ビットを考慮してLVS_LISTを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_LIST)==LVS_LIST) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,2,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_SMALLICON) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_REPORT) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,3,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_LIST)==LVS_LIST) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,2,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SMALLICON) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_REPORT) SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,3,0);
                 else SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_SETCURSEL,0,0);
 
@@ -3080 +3118 @@
                 SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_ADDSTRING,0,(long)STRING_LEFT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_SETCURSEL,1,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_SETCURSEL,1,0);
                 else SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_SETCURSEL,0,0);
 
@@ -3095 +3133 @@
                 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(long)STRING_SORT_DESCENDING);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_SORTASCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_SORTDESCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SORTASCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SORTDESCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_SINGLESEL) SendDlgItemMessage(hwnd,IDC_LVS_SINGLESEL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_AUTOARRANGE) SendDlgItemMessage(hwnd,IDC_LVS_AUTOARRANGE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_NOLABELWRAP) SendDlgItemMessage(hwnd,IDC_LVS_NOLABELWRAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_LVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_LVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_NOCOLUMNHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOCOLUMNHEADER,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_NOSORTHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOSORTHEADER,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_LVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LVS_OWNERDRAWFIXED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LVS_SHAREIMAGELISTS) SendDlgItemMessage(hwnd,IDC_LVS_SHAREIMAGELISTS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SINGLESEL) SendDlgItemMessage(hwnd,IDC_LVS_SINGLESEL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_AUTOARRANGE) SendDlgItemMessage(hwnd,IDC_LVS_AUTOARRANGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOLABELWRAP) SendDlgItemMessage(hwnd,IDC_LVS_NOLABELWRAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_LVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_LVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOCOLUMNHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOCOLUMNHEADER,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_NOSORTHEADER) SendDlgItemMessage(hwnd,IDC_LVS_NOSORTHEADER,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_LVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LVS_OWNERDRAWFIXED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SHAREIMAGELISTS) SendDlgItemMessage(hwnd,IDC_LVS_SHAREIMAGELISTS,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3119 +3157 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3130 +3168 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(LVS_SMALLICON|LVS_LIST|LVS_REPORT);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_SMALLICON;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_LIST;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_REPORT;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SMALLICON|LVS_LIST|LVS_REPORT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SMALLICON );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_LIST );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_REPORT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3144 +3182 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(LVS_ALIGNLEFT);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_ALIGNLEFT;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_ALIGNLEFT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_ALIGNLEFT );
                             return 1;
                         }
@@ -3155 +3193 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(LVS_SORTASCENDING|LVS_SORTDESCENDING);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_SORTASCENDING;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_SORTDESCENDING;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SORTASCENDING|LVS_SORTDESCENDING );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SORTASCENDING );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SORTDESCENDING );
                             return 1;
                         }
@@ -3168 +3206 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_SINGLESEL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_SINGLESEL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_SINGLESEL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SINGLESEL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SINGLESEL );
                             return 1;
                         }
@@ -3180 +3218 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_AUTOARRANGE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_AUTOARRANGE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_AUTOARRANGE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_AUTOARRANGE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_AUTOARRANGE );
                             return 1;
                         }
@@ -3192 +3230 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOLABELWRAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_NOLABELWRAP;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_NOLABELWRAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOLABELWRAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOLABELWRAP );
                             return 1;
                         }
@@ -3204 +3242 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_EDITLABELS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_EDITLABELS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_EDITLABELS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_EDITLABELS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_EDITLABELS );
                             return 1;
                         }
@@ -3216 +3254 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_NOSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_NOSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3229 +3267 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOCOLUMNHEADER,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_NOCOLUMNHEADER;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_NOCOLUMNHEADER;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOCOLUMNHEADER );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOCOLUMNHEADER );
                             return 1;
                         }
@@ -3241 +3279 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_NOSORTHEADER,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_NOSORTHEADER;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_NOSORTHEADER;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_NOSORTHEADER );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_NOSORTHEADER );
                             return 1;
                         }
@@ -3253 +3291 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_SHOWSELALWAYS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_SHOWSELALWAYS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_SHOWSELALWAYS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SHOWSELALWAYS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SHOWSELALWAYS );
                             return 1;
                         }
@@ -3265 +3303 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_OWNERDRAWFIXED,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_OWNERDRAWFIXED;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_OWNERDRAWFIXED;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_OWNERDRAWFIXED );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_OWNERDRAWFIXED );
                             return 1;
                         }
@@ -3277 +3315 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LVS_SHAREIMAGELISTS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LVS_SHAREIMAGELISTS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LVS_SHAREIMAGELISTS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LVS_SHAREIMAGELISTS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LVS_SHAREIMAGELISTS );
                             return 1;
                         }
@@ -3329 +3367 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -3338 +3376 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
                 ////////
@@ -3356 +3394 @@
                 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(long)STRING_NONE_);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_MULTIPLESEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_EXTENDEDSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,2,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_NOSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,3,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_MULTIPLESEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_EXTENDEDSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,2,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOSEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,3,0);
                 else SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,0,0);
 
@@ -3373 +3411 @@
                 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_OWNERDRAW_VARIABLE);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_LBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_SORT) SendDlgItemMessage(hwnd,IDC_LBS_SORT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_NOTIFY) SendDlgItemMessage(hwnd,IDC_LBS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_MULTICOLUMN) SendDlgItemMessage(hwnd,IDC_LBS_MULTICOLUMN,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_LBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_NOREDRAW) SendDlgItemMessage(hwnd,IDC_LBS_NOREDRAW,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_USETABSTOPS) SendDlgItemMessage(hwnd,IDC_LBS_USETABSTOPS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&LBS_WANTKEYBOARDINPUT) SendDlgItemMessage(hwnd,IDC_LBS_WANTKEYBOARDINPUT,BM_SETCHECK,BST_CHECKED,0);
-
-                RadProperty_ListBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_LBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_SORT) SendDlgItemMessage(hwnd,IDC_LBS_SORT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOTIFY) SendDlgItemMessage(hwnd,IDC_LBS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_MULTICOLUMN) SendDlgItemMessage(hwnd,IDC_LBS_MULTICOLUMN,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_LBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_NOREDRAW) SendDlgItemMessage(hwnd,IDC_LBS_NOREDRAW,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_USETABSTOPS) SendDlgItemMessage(hwnd,IDC_LBS_USETABSTOPS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_WANTKEYBOARDINPUT) SendDlgItemMessage(hwnd,IDC_LBS_WANTKEYBOARDINPUT,BM_SETCHECK,BST_CHECKED,0);
+
+                DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                RadProperty_ListBox_StylingOrder(hwnd,&tempStyle);
+                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
 
 
@@ -3399 +3439 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3410 +3450 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(LBS_MULTIPLESEL|LBS_EXTENDEDSEL|LBS_NOSEL);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_MULTIPLESEL;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_EXTENDEDSEL;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_NOSEL;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_MULTIPLESEL|LBS_EXTENDEDSEL|LBS_NOSEL );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_MULTIPLESEL );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_EXTENDEDSEL );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOSEL );
                             return 1;
                         }
@@ -3423 +3463 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(LBS_OWNERDRAWFIXED|LBS_OWNERDRAWVARIABLE);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_OWNERDRAWFIXED;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_OWNERDRAWVARIABLE;
-
-                            RadProperty_ListBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_OWNERDRAWFIXED|LBS_OWNERDRAWVARIABLE );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_OWNERDRAWFIXED );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_OWNERDRAWVARIABLE );
+
+                            DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle();
+                            RadProperty_ListBox_StylingOrder(hwnd,&tempStyle);
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle );
                             return 1;
                         }
@@ -3438 +3480 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_HASSTRINGS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_HASSTRINGS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_HASSTRINGS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_HASSTRINGS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_HASSTRINGS );
                             return 1;
                         }
@@ -3450 +3492 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_SORT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_SORT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_SORT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_SORT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_SORT );
                             return 1;
                         }
@@ -3462 +3504 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_NOTIFY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_NOTIFY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_NOTIFY );
                             return 1;
                         }
@@ -3474 +3516 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_MULTICOLUMN,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_MULTICOLUMN;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_MULTICOLUMN;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_MULTICOLUMN );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_MULTICOLUMN );
                             return 1;
                         }
@@ -3486 +3528 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=WS_HSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~WS_HSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_HSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_HSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3499 +3541 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=WS_VSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~WS_VSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3512 +3554 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_DISABLENOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_DISABLENOSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_DISABLENOSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_DISABLENOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_DISABLENOSCROLL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3525 +3567 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_NOREDRAW,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_NOREDRAW;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_NOREDRAW;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_NOREDRAW );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_NOREDRAW );
                             return 1;
                         }
@@ -3537 +3579 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_USETABSTOPS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_USETABSTOPS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_USETABSTOPS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_USETABSTOPS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_USETABSTOPS );
                             return 1;
                         }
@@ -3549 +3591 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_LBS_WANTKEYBOARDINPUT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=LBS_WANTKEYBOARDINPUT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~LBS_WANTKEYBOARDINPUT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( LBS_WANTKEYBOARDINPUT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( LBS_WANTKEYBOARDINPUT );
                             return 1;
                         }
@@ -3583 +3625 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -3592 +3634 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&PBS_VERTICAL) SendDlgItemMessage(hwnd,IDC_PBS_VERTICAL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&PBS_SMOOTH) SendDlgItemMessage(hwnd,IDC_PBS_SMOOTH,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&PBS_VERTICAL) SendDlgItemMessage(hwnd,IDC_PBS_VERTICAL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&PBS_SMOOTH) SendDlgItemMessage(hwnd,IDC_PBS_SMOOTH,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3609 +3651 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3620 +3662 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_PBS_VERTICAL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=PBS_VERTICAL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~PBS_VERTICAL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( PBS_VERTICAL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( PBS_VERTICAL );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3633 +3675 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_PBS_SMOOTH,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=PBS_SMOOTH;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~PBS_SMOOTH;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( PBS_SMOOTH );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( PBS_SMOOTH );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3668 +3710 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -3678 +3720 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_AUTORADIOBUTTON)==BS_AUTORADIOBUTTON) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTORADIOBUTTON)==BS_AUTORADIOBUTTON) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3706 +3748 @@
 
                 //ビットを考慮してBS_CENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0);
 
@@ -3726 +3768 @@
 
                 //ビットを考慮してBS_VCENTERを最初に比較する
-                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
+                if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0);
 
@@ -3740 +3782 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3751 +3793 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_AUTORADIOBUTTON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTORADIOBUTTON );
                             }
                             else{
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=0xFFFFFFF0;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_RADIOBUTTON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RADIOBUTTON );
                             }
                             return 1;
@@ -3767 +3809 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_PUSHLIKE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_PUSHLIKE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_PUSHLIKE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_PUSHLIKE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3780 +3822 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_LEFTTEXT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_LEFTTEXT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFTTEXT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFTTEXT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3793 +3835 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_ICON;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_BITMAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                                 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_ICON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3809 +3851 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_BITMAP;
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_ICON;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP );
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON );
                                 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0);
                             }
                             else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_BITMAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3825 +3867 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_MULTILINE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_MULTILINE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3838 +3880 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_NOTIFY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~BS_NOTIFY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY );
                             return 1;
                         }
@@ -3851 +3893 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(BS_LEFT|BS_RIGHT|BS_CENTER);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_LEFT;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_RIGHT;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_CENTER;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3865 +3907 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(BS_TOP|BS_BOTTOM|BS_VCENTER);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_TOP;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_BOTTOM;
-                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=BS_VCENTER;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM );
+                            else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -3902 +3944 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -3911 +3953 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -3928 +3970 @@
                 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,(long)STRING_SCROLLBARPROP_STYLE_BOTTOMORRIGHT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SBS_TOPALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SBS_BOTTOMALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SBS_TOPALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SBS_BOTTOMALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,0,0);
 
@@ -3941 +3983 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -3952 +3994 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(SBS_TOPALIGN|SBS_BOTTOMALIGN);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SBS_TOPALIGN;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SBS_BOTTOMALIGN;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SBS_TOPALIGN|SBS_BOTTOMALIGN );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SBS_TOPALIGN );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SBS_BOTTOMALIGN );
                             return 1;
                         }
@@ -3987 +4029 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -3997 +4039 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_NOPREFIX) SendDlgItemMessage(hwnd,IDC_SS_NOPREFIX,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_LEFTNOWORDWRAP) SendDlgItemMessage(hwnd,IDC_SS_LEFTNOWORDWRAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOPREFIX) SendDlgItemMessage(hwnd,IDC_SS_NOPREFIX,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_LEFTNOWORDWRAP) SendDlgItemMessage(hwnd,IDC_SS_LEFTNOWORDWRAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_NOTIFY) SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4019 +4061 @@
 
                 //ビットを考慮してSS_LEFTを最後に検討する
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_CENTER) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&SS_RIGHT) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_CENTER) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&SS_RIGHT) SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,0,0);
 
@@ -4032 +4074 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -4043 +4085 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_NOPREFIX,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_NOPREFIX;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~SS_NOPREFIX;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOPREFIX );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOPREFIX );
                             return 1;
                         }
@@ -4055 +4097 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_LEFTNOWORDWRAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_LEFTNOWORDWRAP;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~SS_LEFTNOWORDWRAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_LEFTNOWORDWRAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_LEFTNOWORDWRAP );
 
                             DrawRadWindow(i,pWindowInfo);
@@ -4069 +4111 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_SS_NOTIFY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_NOTIFY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~SS_NOTIFY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_NOTIFY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_NOTIFY );
                             return 1;
                         }
@@ -4082 +4124 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_GETCURSEL,0,0);
                             //SS_LEFT=0
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(SS_CENTER|SS_RIGHT);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_CENTER;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=SS_RIGHT;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( SS_CENTER|SS_RIGHT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_CENTER );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( SS_RIGHT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4118 +4160 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -4127 +4169 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4142 +4184 @@
                 SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_ADDSTRING,0,(long)STRING_DIRECTION_VERTICAL);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TBS_VERT) SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_SETCURSEL,1,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_VERT) SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_SETCURSEL,1,0);
                 else SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_SETCURSEL,0,0);
 
@@ -4157 +4199 @@
                 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,(long)STRING_TRACKBARPROP_STYLE_POSITION_BOTTOMORRIGHT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TBS_BOTH) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,0,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TBS_TOP) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,1,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_BOTH) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,0,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_TOP) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,1,0);
                 else SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,2,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TBS_NOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_NOTICKS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TBS_AUTOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_AUTOTICKS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TBS_ENABLESELRANGE) SendDlgItemMessage(hwnd,IDC_TBS_ENABLESELRANGE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_NOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_NOTICKS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_AUTOTICKS) SendDlgItemMessage(hwnd,IDC_TBS_AUTOTICKS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_ENABLESELRANGE) SendDlgItemMessage(hwnd,IDC_TBS_ENABLESELRANGE,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4174 +4216 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -4185 +4227 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TBS_VERT;
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TBS_VERT;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_VERT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_VERT );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4197 +4239 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(TBS_BOTH|TBS_TOP);
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TBS_BOTH;
-                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TBS_TOP;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_BOTH|TBS_TOP );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_BOTH );
+                            else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_TOP );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4211 +4253 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TBS_NOTICKS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TBS_NOTICKS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TBS_NOTICKS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_NOTICKS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_NOTICKS );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4224 +4266 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TBS_AUTOTICKS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TBS_AUTOTICKS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TBS_AUTOTICKS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_AUTOTICKS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_AUTOTICKS );
                             return 1;
                         }
@@ -4236 +4278 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TBS_ENABLESELRANGE,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TBS_ENABLESELRANGE;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TBS_ENABLESELRANGE;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TBS_ENABLESELRANGE );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TBS_ENABLESELRANGE );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4271 +4313 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
 
 
@@ -4279 +4321 @@
                 //スタイル
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
-
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_HASBUTTONS) SendDlgItemMessage(hwnd,IDC_TVS_HASBUTTONS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_HASLINES) SendDlgItemMessage(hwnd,IDC_TVS_HASLINES,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_LINESATROOT) SendDlgItemMessage(hwnd,IDC_TVS_LINESATROOT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_TVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_DISABLEDRAGDROP) SendDlgItemMessage(hwnd,IDC_TVS_DISABLEDRAGDROP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_TVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_TVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_NOTOOLTIPS) SendDlgItemMessage(hwnd,IDC_TVS_NOTOOLTIPS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_CHECKBOXES) SendDlgItemMessage(hwnd,IDC_TVS_CHECKBOXES,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_FULLROWSELECT) SendDlgItemMessage(hwnd,IDC_TVS_FULLROWSELECT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_TRACKSELECT) SendDlgItemMessage(hwnd,IDC_TVS_TRACKSELECT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&TVS_SINGLEEXPAND) SendDlgItemMessage(hwnd,IDC_TVS_SINGLEEXPAND,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_HASBUTTONS) SendDlgItemMessage(hwnd,IDC_TVS_HASBUTTONS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_HASLINES) SendDlgItemMessage(hwnd,IDC_TVS_HASLINES,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_LINESATROOT) SendDlgItemMessage(hwnd,IDC_TVS_LINESATROOT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_EDITLABELS) SendDlgItemMessage(hwnd,IDC_TVS_EDITLABELS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_DISABLEDRAGDROP) SendDlgItemMessage(hwnd,IDC_TVS_DISABLEDRAGDROP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_SHOWSELALWAYS) SendDlgItemMessage(hwnd,IDC_TVS_SHOWSELALWAYS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_NOSCROLL) SendDlgItemMessage(hwnd,IDC_TVS_NOSCROLL,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_NOTOOLTIPS) SendDlgItemMessage(hwnd,IDC_TVS_NOTOOLTIPS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_CHECKBOXES) SendDlgItemMessage(hwnd,IDC_TVS_CHECKBOXES,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_FULLROWSELECT) SendDlgItemMessage(hwnd,IDC_TVS_FULLROWSELECT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_TRACKSELECT) SendDlgItemMessage(hwnd,IDC_TVS_TRACKSELECT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_SINGLEEXPAND) SendDlgItemMessage(hwnd,IDC_TVS_SINGLEEXPAND,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4306 +4348 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -4317 +4359 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_HASBUTTONS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_HASBUTTONS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_HASBUTTONS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_HASBUTTONS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_HASBUTTONS );
                             return 1;
                         }
@@ -4329 +4371 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_HASLINES,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_HASLINES;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_HASLINES;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_HASLINES );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_HASLINES );
                             return 1;
                         }
@@ -4341 +4383 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_LINESATROOT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_LINESATROOT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_LINESATROOT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_LINESATROOT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_LINESATROOT );
                             return 1;
                         }
@@ -4353 +4395 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_EDITLABELS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_EDITLABELS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_EDITLABELS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_EDITLABELS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_EDITLABELS );
                             return 1;
                         }
@@ -4365 +4407 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_DISABLEDRAGDROP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_DISABLEDRAGDROP;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_DISABLEDRAGDROP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_DISABLEDRAGDROP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_DISABLEDRAGDROP );
                             return 1;
                         }
@@ -4377 +4419 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_SHOWSELALWAYS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_SHOWSELALWAYS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_SHOWSELALWAYS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_SHOWSELALWAYS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_SHOWSELALWAYS );
                             return 1;
                         }
@@ -4389 +4431 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_NOSCROLL,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_NOSCROLL;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_NOSCROLL;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_NOSCROLL );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_NOSCROLL );
                             return 1;
                         }
@@ -4401 +4443 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_NOTOOLTIPS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_NOTOOLTIPS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_NOTOOLTIPS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_NOTOOLTIPS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_NOTOOLTIPS );
                             return 1;
                         }
@@ -4413 +4455 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_CHECKBOXES,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_CHECKBOXES;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_CHECKBOXES;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_CHECKBOXES );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_CHECKBOXES );
                             return 1;
                         }
@@ -4425 +4467 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_FULLROWSELECT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_FULLROWSELECT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_FULLROWSELECT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_FULLROWSELECT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_FULLROWSELECT );
                             return 1;
                         }
@@ -4437 +4479 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_TRACKSELECT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_TRACKSELECT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_TRACKSELECT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_TRACKSELECT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_TRACKSELECT );
                             return 1;
                         }
@@ -4449 +4491 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_TVS_SINGLEEXPAND,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=TVS_SINGLEEXPAND;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~TVS_SINGLEEXPAND;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( TVS_SINGLEEXPAND );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( TVS_SINGLEEXPAND );
                             return 1;
                         }
@@ -4483 +4525 @@
                 bInitial=1;
                 i=GetWndNum(GetParent(GetParent(hwnd)));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-
-                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName);
-                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+
+                SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str());
+                SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str());
 
 
@@ -4493 +4535 @@
                 ////////////
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4508 +4550 @@
                 SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_ADDSTRING,0,(long)STRING_DIRECTION_VERTICAL);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_HORZ) SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_SETCURSEL,0,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_HORZ) SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_SETCURSEL,0,0);
                 else SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_SETCURSEL,1,0);
 
@@ -4522 +4564 @@
                 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(long)STRING_RIGHT);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,1,0);
-                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_ALIGNRIGHT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,2,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,1,0);
+                else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ALIGNRIGHT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,2,0);
                 else SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,0,0);
 
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_AUTOBUDDY) SendDlgItemMessage(hwnd,IDC_UDS_AUTOBUDDY,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_SETBUDDYINT) SendDlgItemMessage(hwnd,IDC_UDS_SETBUDDYINT,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_NOTHOUSANDS) SendDlgItemMessage(hwnd,IDC_UDS_NOTHOUSANDS,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_WRAP) SendDlgItemMessage(hwnd,IDC_UDS_WRAP,BM_SETCHECK,BST_CHECKED,0);
-                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&UDS_ARROWKEYS) SendDlgItemMessage(hwnd,IDC_UDS_ARROWKEYS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_AUTOBUDDY) SendDlgItemMessage(hwnd,IDC_UDS_AUTOBUDDY,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_SETBUDDYINT) SendDlgItemMessage(hwnd,IDC_UDS_SETBUDDYINT,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_NOTHOUSANDS) SendDlgItemMessage(hwnd,IDC_UDS_NOTHOUSANDS,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_WRAP) SendDlgItemMessage(hwnd,IDC_UDS_WRAP,BM_SETCHECK,BST_CHECKED,0);
+                if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ARROWKEYS) SendDlgItemMessage(hwnd,IDC_UDS_ARROWKEYS,BM_SETCHECK,BST_CHECKED,0);
 
 
@@ -4541 +4583 @@
                 if(i==-1) return 1;
                 i2=GetWndInfoNum(MdiInfo[i].path);
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
 
                 //共通スタイル
@@ -4552 +4594 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~UDS_HORZ;
-                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_HORZ;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_HORZ );
+                            if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_HORZ );
                             DrawRadWindow(i,pWindowInfo);
                             return 1;
@@ -4564 +4606 @@
                         if(HIWORD(wParam)==CBN_SELCHANGE){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             i3=SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_GETCURSEL,0,0);
-                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(UDS_ALIGNLEFT|UDS_ALIGNRIGHT);
-                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_ALIGNLEFT;
-                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_ALIGNRIGHT;
+                            pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_ALIGNLEFT|UDS_ALIGNRIGHT );
+                            if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ALIGNLEFT );
+                            else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ALIGNRIGHT );
                             return 1;
                         }
@@ -4577 +4619 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_AUTOBUDDY,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_AUTOBUDDY;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~UDS_AUTOBUDDY;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_AUTOBUDDY );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_AUTOBUDDY );
                             return 1;
                         }
@@ -4589 +4631 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_SETBUDDYINT,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_SETBUDDYINT;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~UDS_SETBUDDYINT;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_SETBUDDYINT );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_SETBUDDYINT );
                             return 1;
                         }
@@ -4601 +4643 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_NOTHOUSANDS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_NOTHOUSANDS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~UDS_NOTHOUSANDS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_NOTHOUSANDS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_NOTHOUSANDS );
                             return 1;
                         }
@@ -4613 +4655 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_WRAP,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_WRAP;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~UDS_WRAP;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_WRAP );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_WRAP );
                             return 1;
                         }
@@ -4625 +4667 @@
                         if(HIWORD(wParam)==BN_CLICKED){
                             //変更情報
-                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style);
+                            Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle());
 
                             if(SendDlgItemMessage(hwnd,IDC_UDS_ARROWKEYS,BM_GETCHECK,0,0))
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=UDS_ARROWKEYS;
-                            else
-                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~UDS_ARROWKEYS;
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( UDS_ARROWKEYS );
+                            else
+                                pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( UDS_ARROWKEYS );
                             return 1;
                         }

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

@@ -20 +20 @@
     pUndoState->NowPos=i;
 
-    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
     int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum].path);
     switch(pUndoState->Command[pUndoState->NowPos]){
@@ -28 +28 @@
             break;
         case RAD_UNDO_DELETEITEM:
-            CHILDINFO *pChildInfo;
+            ActiveBasic::PM::ChildWindowInfo *pChildInfo;
             RECT rect;
-            pChildInfo=(CHILDINFO *)pUndoState->lpdwData[pUndoState->NowPos];
+            pChildInfo=(ActiveBasic::PM::ChildWindowInfo *)pUndoState->lpdwData[pUndoState->NowPos];
             rect.left=pChildInfo->pos.x;
             rect.top=pChildInfo->pos.y;
@@ -37 +37 @@
             InsertDlgItem(WndNum,WndInfoNum,pUndoState->SelectItemNum[pUndoState->NowPos],
                 &pChildInfo->pos,&pChildInfo->size,
-                pChildInfo->IdName,pChildInfo->caption,pChildInfo->style,pChildInfo->ExStyle,pChildInfo->Control,pChildInfo->ImageCtrlInfo.type,pChildInfo->ImageCtrlInfo.path,0);
+                pChildInfo->GetName().c_str(),pChildInfo->GetCaption().c_str(),pChildInfo->GetStyle(),pChildInfo->GetExStyle(),pChildInfo->Control,pChildInfo->image.type,pChildInfo->image.path.c_str(),0);
             break;
         case RAD_UNDO_NAME:
@@ -60 +60 @@
             }
             else{
-                temporary=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->IdName;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->IdName=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
+                std::string tempStr = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetName();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetName( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
@@ -69 +70 @@
         case RAD_UNDO_CAPTION:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                temporary=pWindowInfo->caption;
-                pWindowInfo->caption=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
-            }
-            else{
-                temporary=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->caption;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->caption=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
+                std::string tempStr = pWindowInfo->GetCaption();
+                pWindowInfo->SetCaption( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
+            }
+            else{
+                std::string tempStr = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetCaption();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetCaption( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
@@ -93 +96 @@
             break;
         case RAD_UNDO_BGCOLOR:
-            dw=pWindowInfo->bgColor;
-            pWindowInfo->bgColor=pUndoState->lpdwData[pUndoState->NowPos];
-            pUndoState->lpdwData[pUndoState->NowPos]=dw;
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
-                ChangePropertyWindow(WndNum,WndInfoNum);
-            DrawRadWindow(WndNum,pWindowInfo);
-            break;
+            {
+                int tempBgColor = pWindowInfo->GetBackgroundColor();
+                pWindowInfo->SetBackgroundColor( static_cast<int>(pUndoState->lpdwData[pUndoState->NowPos]) );
+                pUndoState->lpdwData[pUndoState->NowPos] = static_cast<DWORD>(tempBgColor);
+
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                    ChangePropertyWindow(WndNum,WndInfoNum);
+                DrawRadWindow(WndNum,pWindowInfo);
+                break;
+            }
         case RAD_UNDO_WINDOWMENU:
-            temporary=pWindowInfo->MenuID;
-            pWindowInfo->MenuID=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-            pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
-                ChangePropertyWindow(WndNum,WndInfoNum);
-            break;
+            {
+                std::string tempMenuIdName = pWindowInfo->GetMenuIdName();
+                pWindowInfo->SetMenuIdName( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos] = (DWORD)( new std::string( tempMenuIdName ) );
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                {
+                    ChangePropertyWindow(WndNum,WndInfoNum);
+                }
+                DrawRadWindow(WndNum,pWindowInfo);
+                break;
+            }
         case RAD_UNDO_ICONRES:
-            temporary=pWindowInfo->IconResName;
-            pWindowInfo->IconResName=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-            pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
+            {
+                std::string tempStr = pWindowInfo->GetIconResourceName();
+                pWindowInfo->SetIconResourceName( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
+            }
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
@@ -116 +131 @@
         case RAD_UNDO_STYLE:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                dw=pWindowInfo->style;
-                pWindowInfo->style=pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=dw;
-            }
-            else{
-                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->style;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->style=pUndoState->lpdwData[pUndoState->NowPos];
+                dw=pWindowInfo->GetStyle();
+                pWindowInfo->SetStyle( pUndoState->lpdwData[pUndoState->NowPos] );
+                pUndoState->lpdwData[pUndoState->NowPos]=dw;
+            }
+            else{
+                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetStyle();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetStyle( pUndoState->lpdwData[pUndoState->NowPos] );
                 pUndoState->lpdwData[pUndoState->NowPos]=dw;
             }
@@ -131 +146 @@
         case RAD_UNDO_EXSTYLE:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                dw=pWindowInfo->ExStyle;
-                pWindowInfo->ExStyle=pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=dw;
-            }
-            else{
-                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ExStyle;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ExStyle=pUndoState->lpdwData[pUndoState->NowPos];
+                dw=pWindowInfo->GetExStyle();
+                pWindowInfo->SetExStyle( pUndoState->lpdwData[pUndoState->NowPos] );
+                pUndoState->lpdwData[pUndoState->NowPos]=dw;
+            }
+            else{
+                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetExStyle();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetExStyle( pUndoState->lpdwData[pUndoState->NowPos] );
                 pUndoState->lpdwData[pUndoState->NowPos]=dw;
             }
@@ -163 +178 @@
             break;
         case RAD_UNDO_IMAGESTATE:
-            IMAGECTRLINFO *pImageCtrlInfo;
-            pImageCtrlInfo=(IMAGECTRLINFO *)pUndoState->lpdwData[pUndoState->NowPos];
-
-            dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.type;
-            pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.type=pImageCtrlInfo->type;
-            pImageCtrlInfo->type=dw;
-
-            dw=(DWORD)pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.path;
-            pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.path=pImageCtrlInfo->path;
-            pImageCtrlInfo->path=(char *)dw;
-
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
-                ChangePropertyWindow(WndNum,WndInfoNum);
-            DrawRadWindow(WndNum,pWindowInfo);
+            {
+                ActiveBasic::PM::ImageControlInfo *pImageCtrlInfo = (ActiveBasic::PM::ImageControlInfo *)pUndoState->lpdwData[pUndoState->NowPos];
+
+                ActiveBasic::PM::ImageReferenceType::EnumType tempType = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.type;
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.type = pImageCtrlInfo->type;
+                pImageCtrlInfo->type = tempType;
+
+                std::string tempPath = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.path;
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.path = pImageCtrlInfo->path;
+                pImageCtrlInfo->path = tempPath;
+
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                    ChangePropertyWindow(WndNum,WndInfoNum);
+                DrawRadWindow(WndNum,pWindowInfo);
+            }
             break;
         case RAD_UNDO_TYPE:
@@ -197 +213 @@
     char *temporary;
     RAD_UNDOSTATE *pUndoState;
-    CHILDINFO *pChildInfo;
+    ActiveBasic::PM::ChildWindowInfo *pChildInfo;
     RECT rect;
 
@@ -206 +222 @@
     }
 
-    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
     int WndInfoNum = GetWndInfoNum(MdiInfo[WndNum].path);
     switch(pUndoState->Command[pUndoState->NowPos]){
         case RAD_UNDO_INSERTITEM:
-            pChildInfo=(CHILDINFO *)pUndoState->lpdwData[pUndoState->NowPos];
+            pChildInfo=(ActiveBasic::PM::ChildWindowInfo *)pUndoState->lpdwData[pUndoState->NowPos];
             rect.left=pChildInfo->pos.x;
             rect.top=pChildInfo->pos.y;
@@ -217 +233 @@
             InsertDlgItem(WndNum,WndInfoNum,pUndoState->SelectItemNum[pUndoState->NowPos],
                 &pChildInfo->pos,&pChildInfo->size,
-                pChildInfo->IdName,pChildInfo->caption,pChildInfo->style,pChildInfo->ExStyle,pChildInfo->Control,pChildInfo->ImageCtrlInfo.type,pChildInfo->ImageCtrlInfo.path,0);
+                pChildInfo->GetName().c_str(),pChildInfo->GetCaption().c_str(),pChildInfo->GetStyle(),pChildInfo->GetExStyle(),pChildInfo->Control,pChildInfo->image.type,pChildInfo->image.path.c_str(),0);
             break;
         case RAD_UNDO_DELETEITEM:
@@ -244 +260 @@
             }
             else{
-                temporary=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->IdName;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->IdName=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
+                std::string tempStr = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetName();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetName( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
@@ -253 +270 @@
         case RAD_UNDO_CAPTION:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                temporary=pWindowInfo->caption;
-                pWindowInfo->caption=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
-            }
-            else{
-                temporary=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->caption;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->caption=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
+                std::string tempStr = pWindowInfo->GetCaption();
+                pWindowInfo->SetCaption( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
+            }
+            else{
+                std::string tempStr = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetCaption();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetCaption( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
             }
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
@@ -277 +296 @@
             break;
         case RAD_UNDO_BGCOLOR:
-            dw=pWindowInfo->bgColor;
-            pWindowInfo->bgColor=pUndoState->lpdwData[pUndoState->NowPos];
-            pUndoState->lpdwData[pUndoState->NowPos]=dw;
+            {
+                int tempBgColor = pWindowInfo->GetBackgroundColor();
+                pWindowInfo->SetBackgroundColor( static_cast<int>(pUndoState->lpdwData[pUndoState->NowPos]) );
+                pUndoState->lpdwData[pUndoState->NowPos] = static_cast<DWORD>(tempBgColor);
+            }
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
@@ -285 +306 @@
             break;
         case RAD_UNDO_WINDOWMENU:
-            temporary=pWindowInfo->MenuID;
-            pWindowInfo->MenuID=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-            pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
-                ChangePropertyWindow(WndNum,WndInfoNum);
-            break;
+            {
+                std::string tempMenuIdName = pWindowInfo->GetMenuIdName();
+                pWindowInfo->SetMenuIdName( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos] = (DWORD)( new std::string( tempMenuIdName ) );
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                {
+                    ChangePropertyWindow(WndNum,WndInfoNum);
+                }
+                DrawRadWindow(WndNum,pWindowInfo);
+                break;
+            }
         case RAD_UNDO_ICONRES:
-            temporary=pWindowInfo->IconResName;
-            pWindowInfo->IconResName=(char *)pUndoState->lpdwData[pUndoState->NowPos];
-            pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temporary;
+            {
+                std::string tempStr = pWindowInfo->GetIconResourceName();
+                pWindowInfo->SetIconResourceName( *(std::string *)pUndoState->lpdwData[pUndoState->NowPos] );
+                delete (std::string *)pUndoState->lpdwData[pUndoState->NowPos];
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)( new std::string( tempStr ) );
+            }
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
@@ -300 +330 @@
         case RAD_UNDO_STYLE:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                dw=pWindowInfo->style;
-                pWindowInfo->style=pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=dw;
-            }
-            else{
-                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->style;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->style=pUndoState->lpdwData[pUndoState->NowPos];
+                dw=pWindowInfo->GetStyle();
+                pWindowInfo->SetStyle( pUndoState->lpdwData[pUndoState->NowPos] );
+                pUndoState->lpdwData[pUndoState->NowPos]=dw;
+            }
+            else{
+                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetStyle();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetStyle( pUndoState->lpdwData[pUndoState->NowPos] );
                 pUndoState->lpdwData[pUndoState->NowPos]=dw;
             }
@@ -315 +345 @@
         case RAD_UNDO_EXSTYLE:
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==SELECT_WINDOW){
-                dw=pWindowInfo->ExStyle;
-                pWindowInfo->ExStyle=pUndoState->lpdwData[pUndoState->NowPos];
-                pUndoState->lpdwData[pUndoState->NowPos]=dw;
-            }
-            else{
-                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ExStyle;
-                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ExStyle=pUndoState->lpdwData[pUndoState->NowPos];
+                dw=pWindowInfo->GetExStyle();
+                pWindowInfo->SetExStyle( pUndoState->lpdwData[pUndoState->NowPos] );
+                pUndoState->lpdwData[pUndoState->NowPos]=dw;
+            }
+            else{
+                dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->GetExStyle();
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->SetExStyle( pUndoState->lpdwData[pUndoState->NowPos] );
                 pUndoState->lpdwData[pUndoState->NowPos]=dw;
             }
@@ -347 +377 @@
             break;
         case RAD_UNDO_IMAGESTATE:
-            IMAGECTRLINFO *pImageCtrlInfo;
-            pImageCtrlInfo=(IMAGECTRLINFO *)pUndoState->lpdwData[pUndoState->NowPos];
-
-            dw=pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.type;
-            pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.type=pImageCtrlInfo->type;
-            pImageCtrlInfo->type=dw;
-
-            dw=(DWORD)pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.path;
-            pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->ImageCtrlInfo.path=pImageCtrlInfo->path;
-            pImageCtrlInfo->path=(char *)dw;
-
-            if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
-                ChangePropertyWindow(WndNum,WndInfoNum);
-            DrawRadWindow(WndNum,pWindowInfo);
-            break;
+            {
+                ActiveBasic::PM::ImageControlInfo *pImageCtrlInfo = (ActiveBasic::PM::ImageControlInfo *)pUndoState->lpdwData[pUndoState->NowPos];
+
+                ActiveBasic::PM::ImageReferenceType::EnumType tempType = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.type;
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.type = pImageCtrlInfo->type;
+                pImageCtrlInfo->type = tempType;
+
+                std::string tempPath = pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.path;
+                pWindowInfo->childWindowInfos[pUndoState->SelectItemNum[pUndoState->NowPos]]->image.path = pImageCtrlInfo->path;
+                pImageCtrlInfo->path = tempPath;
+
+                if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
+                    ChangePropertyWindow(WndNum,WndInfoNum);
+                DrawRadWindow(WndNum,pWindowInfo);
+                break;
+            }
         case RAD_UNDO_TYPE:
             dw=pWindowInfo->type;
@@ -387 +418 @@
         case RAD_UNDO_INSERTITEM:
         case RAD_UNDO_DELETEITEM:
-            CHILDINFO *pChildInfo;
-            pChildInfo=(CHILDINFO *)pUndoState->lpdwData[pos];
-            HeapDefaultFree(pChildInfo->IdName);
-            HeapDefaultFree(pChildInfo->caption);
-            if(pChildInfo->Control==CT_IMAGEBOX){
-                //イメージ ボックスの場合
-                HeapDefaultFree(pChildInfo->ImageCtrlInfo.path);
-            }
-            HeapDefaultFree(pChildInfo);
+            ActiveBasic::PM::ChildWindowInfo *pChildInfo;
+            pChildInfo=(ActiveBasic::PM::ChildWindowInfo *)pUndoState->lpdwData[pos];
+            delete pChildInfo;
             break;
         case RAD_UNDO_NAME:
@@ -403 +428 @@
                 delete names;
             }
-            else HeapDefaultFree((void *)pUndoState->lpdwData[pos]);
+            else
+            {
+                std::string *pTempStr = (std::string *)pUndoState->lpdwData[pos];
+                delete pTempStr;
+            }
             break;
         case RAD_UNDO_CAPTION:
-            HeapDefaultFree((void *)pUndoState->lpdwData[pos]);
+            {
+                std::string *pTempStr = (std::string *)pUndoState->lpdwData[pos];
+                delete pTempStr;
+            }
             break;
         case RAD_UNDO_FONT:
@@ -412 +444 @@
             break;
         case RAD_UNDO_WINDOWMENU:
-            if(pUndoState->lpdwData[pos])
-                HeapDefaultFree((void *)pUndoState->lpdwData[pos]);
+            {
+                std::string *pTempMenuId = (std::string *)pUndoState->lpdwData[pos];
+                delete pTempMenuId;
+            }
             break;
         case RAD_UNDO_ICONRES:
-            if(pUndoState->lpdwData[pos])
-                HeapDefaultFree((void *)pUndoState->lpdwData[pos]);
+            {
+                std::string *pTempStr = (std::string *)pUndoState->lpdwData[pos];
+                delete pTempStr;
+            }
             break;
         case RAD_UNDO_POSITION:
@@ -423 +459 @@
             break;
         case RAD_UNDO_IMAGESTATE:
-            IMAGECTRLINFO *pImageCtrlInfo;
-            pImageCtrlInfo=(IMAGECTRLINFO *)pUndoState->lpdwData[pos];
-            HeapDefaultFree(pImageCtrlInfo->path);
-            HeapDefaultFree(pImageCtrlInfo);
-            break;
+            {
+                ActiveBasic::PM::ImageControlInfo *pImageCtrlInfo = (ActiveBasic::PM::ImageControlInfo *)pUndoState->lpdwData[pUndoState->NowPos];
+
+                delete pImageCtrlInfo;
+
+                break;
+            }
     }
     pUndoState->Command[pos]=0;
@@ -435 +473 @@
     extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
-    char *temporary,*temp2;
     RAD_UNDOSTATE *pUndoState;
 
@@ -452 +489 @@
         case RAD_UNDO_INSERTITEM:
         case RAD_UNDO_DELETEITEM:
-            CHILDINFO *pChildInfo,*pSaveChildInfo;
-            pChildInfo=(CHILDINFO *)dwData;
-            pSaveChildInfo=(CHILDINFO *)HeapAlloc(hHeap,0,sizeof(CHILDINFO));
-            pSaveChildInfo->IdName=(char *)HeapAlloc(hHeap,0,lstrlen(pChildInfo->IdName)+1);
-            lstrcpy(pSaveChildInfo->IdName,pChildInfo->IdName);
+            ActiveBasic::PM::ChildWindowInfo *pChildInfo,*pSaveChildInfo;
+            pChildInfo=(ActiveBasic::PM::ChildWindowInfo *)dwData;
+            pSaveChildInfo = new ActiveBasic::PM::ChildWindowInfo();
+            pSaveChildInfo->SetName( pChildInfo->GetName() );
             pSaveChildInfo->pos=pChildInfo->pos;
             pSaveChildInfo->size=pChildInfo->size;
-            pSaveChildInfo->caption=(char *)HeapAlloc(hHeap,0,lstrlen(pChildInfo->caption)+1);
-            lstrcpy(pSaveChildInfo->caption,pChildInfo->caption);
-            pSaveChildInfo->style=pChildInfo->style;
-            pSaveChildInfo->ExStyle=pChildInfo->ExStyle;
+            pSaveChildInfo->SetCaption( pChildInfo->GetCaption() );
+            pSaveChildInfo->SetStyle( pChildInfo->GetStyle() );
+            pSaveChildInfo->SetExStyle( pChildInfo->GetExStyle() );
             pSaveChildInfo->Control=pChildInfo->Control;
             if(pChildInfo->Control==CT_IMAGEBOX){
                 //イメージ ボックスの場合
-                pSaveChildInfo->ImageCtrlInfo.type=pChildInfo->ImageCtrlInfo.type;
-                pSaveChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,0,lstrlen(pChildInfo->ImageCtrlInfo.path)+1);
-                lstrcpy(pSaveChildInfo->ImageCtrlInfo.path,pChildInfo->ImageCtrlInfo.path);
+                pSaveChildInfo->image = pChildInfo->image;
             }
             pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)pSaveChildInfo;
@@ -483 +516 @@
             }
             else{
-                temporary=(char *)dwData;
-                temp2=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-                lstrcpy(temp2,temporary);
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temp2;
+                std::string *pTempStr = new std::string( *(std::string *)dwData );
+                pUndoState->lpdwData[pUndoState->NowPos] = (DWORD)pTempStr;
             }
             break;
         case RAD_UNDO_CAPTION:
-            temporary=(char *)dwData;
-            temp2=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-            lstrcpy(temp2,temporary);
-            pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temp2;
+            {
+                std::string *pTempStr = new std::string( *(std::string *)dwData );
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)pTempStr;
+            }
             break;
         case RAD_UNDO_FONT:
@@ -506 +537 @@
             break;
         case RAD_UNDO_WINDOWMENU:
+            {
+                std::string *pTempStr = new std::string( *(std::string *)dwData );
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)pTempStr;
+            }
+            break;
         case RAD_UNDO_ICONRES:
-            if(!dwData) pUndoState->lpdwData[pUndoState->NowPos]=0;
-            else{
-                temporary=(char *)dwData;
-                temp2=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-                lstrcpy(temp2,temporary);
-                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)temp2;
+            {
+                std::string *pTempStr = new std::string( *(std::string *)dwData );
+                pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)pTempStr;
             }
             break;
@@ -528 +561 @@
             break;
         case RAD_UNDO_IMAGESTATE:
-            IMAGECTRLINFO *pImageCtrlInfo,*pSaveImageCtrlInfo;
-            pImageCtrlInfo=(IMAGECTRLINFO *)dwData;
-            pSaveImageCtrlInfo=(IMAGECTRLINFO *)HeapAlloc(hHeap,0,sizeof(IMAGECTRLINFO));
-            pSaveImageCtrlInfo->type=pImageCtrlInfo->type;
-            pSaveImageCtrlInfo->path=(char *)HeapAlloc(hHeap,0,lstrlen(pImageCtrlInfo->path)+1);
-            lstrcpy(pSaveImageCtrlInfo->path,pImageCtrlInfo->path);
-            pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)pSaveImageCtrlInfo;
-            break;
+            {
+                ActiveBasic::PM::ImageControlInfo *pImageCtrlInfo = (ActiveBasic::PM::ImageControlInfo *)dwData;
+                ActiveBasic::PM::ImageControlInfo *pSaveImageCtrlInfo = new ActiveBasic::PM::ImageControlInfo( *pImageCtrlInfo );
+                pUndoState->lpdwData[pUndoState->NowPos] = (DWORD)( new ActiveBasic::PM::ImageControlInfo( *pImageCtrlInfo ) );
+                break;
+            }
         case RAD_UNDO_TYPE:
             pUndoState->lpdwData[pUndoState->NowPos]=dwData;

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

@@ -82 +82 @@
 
     //重複チェック
-    for(i2=0;i2<projectInfo.resourceManager.cursorResources.size();i2++){
+    for(i2=0;i2<static_cast<int>(projectInfo.resourceManager.cursorResources.size());i2++){
         if(i2==CursorInfoNum) continue;
         if( projectInfo.resourceManager.cursorResources[i2].idName == NewIdName )
@@ -190 +190 @@
 
     //重複チェック
-    for(i2=0;i2<projectInfo.resourceManager.bitmapResources.size();i2++){
+    for(i2=0;i2<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i2++){
         if(i2==BitmapInfoNum) continue;
         if( projectInfo.resourceManager.bitmapResources[i2].idName == NewIdName )
@@ -323 +323 @@
 
     //重複チェック
-    for(i2=0;i2<projectInfo.resourceManager.iconResources.size();i2++){
+    for(i2=0;i2<static_cast<int>(projectInfo.resourceManager.iconResources.size());i2++){
         if(i2==IconInfoNum) continue;
         if( projectInfo.resourceManager.iconResources[i2].idName == NewIdName )

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

@@ -19 +19 @@
     return -1;
 }
-WindowInfo *GetWndInfo( char *name )
+ActiveBasic::PM::WindowInfo *GetWndInfo( char *name )
 {
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         if(lstrcmpi(name,pWindowInfo->GetName().c_str())==0) return pWindowInfo;
@@ -65 +65 @@
 
 HGLOBAL Rad_GetChildInfoClipboardData(int WndNum,int WndInfoNum){
-    //CHILDINFO構造体をクリップボード用データ（pByteが示すバッファ）に変換する
+    //ChildWindowInfo構造体をクリップボード用データ（pByteが示すバッファ）に変換する
     extern MDIINFO MdiInfo[MAX_WNDNUM];
     HGLOBAL hGlobal;
@@ -85 +85 @@
 
     for(i3--;i3>=0;i3--){
-        CHILDINFO *pChildInfo = projectInfo.windowInfos[WndInfoNum]->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]];
-
-        MemSize+=lstrlen(pChildInfo->IdName)+1+
+        ActiveBasic::PM::ChildWindowInfo *pChildInfo = projectInfo.windowInfos[WndInfoNum]->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]];
+
+        MemSize+=pChildInfo->GetName().size()+1+
             sizeof(POINT)+
             sizeof(SIZE)+
-            lstrlen(pChildInfo->caption)+1+
+            pChildInfo->GetCaption().size()+1+
             sizeof(DWORD)+
             sizeof(DWORD)+
             sizeof(int)+
             sizeof(int)+
-            lstrlen(pChildInfo->ImageCtrlInfo.path)+1;
+            pChildInfo->image.path.size()+1;
 
         hGlobal=GlobalReAlloc(hGlobal,MemSize,0);
         pByte=(BYTE *)GlobalLock(hGlobal);
 
-        lstrcpy((char *)pByte+i2,pChildInfo->IdName);
-        i2+=lstrlen(pChildInfo->IdName)+1;
+        lstrcpy((char *)pByte+i2,pChildInfo->GetName().c_str());
+        i2+=pChildInfo->GetName().size()+1;
 
         memcpy(pByte+i2,&pChildInfo->pos,sizeof(POINT));
@@ -109 +109 @@
         i2+=sizeof(SIZE);
 
-        lstrcpy((char *)pByte+i2,pChildInfo->caption);
-        i2+=lstrlen(pChildInfo->caption)+1;
-
-        memcpy(pByte+i2,&pChildInfo->style,sizeof(DWORD));
+        lstrcpy((char *)pByte+i2,pChildInfo->GetCaption().c_str());
+        i2+=pChildInfo->GetCaption().size()+1;
+
+        *(DWORD *)(pByte+i2) = pChildInfo->GetStyle();
         i2+=sizeof(DWORD);
 
-        memcpy(pByte+i2,&pChildInfo->ExStyle,sizeof(DWORD));
+        *(DWORD *)(pByte+i2) = pChildInfo->GetExStyle();
         i2+=sizeof(DWORD);
 
@@ -121 +121 @@
         i2+=sizeof(int);
 
-        memcpy(pByte+i2,&pChildInfo->ImageCtrlInfo.type,sizeof(int));
+        memcpy(pByte+i2,&pChildInfo->image.type,sizeof(int));
         i2+=sizeof(int);
 
-        if(!pChildInfo->ImageCtrlInfo.path){
+        if( pChildInfo->image.path.empty() )
+        {
             lstrcpy((char *)pByte+i2,"");
             i2++;
         }
         else{
-            lstrcpy((char *)pByte+i2,pChildInfo->ImageCtrlInfo.path);
-            i2+=lstrlen(pChildInfo->ImageCtrlInfo.path)+1;
+            lstrcpy((char *)pByte+i2,pChildInfo->image.path.c_str());
+            i2+=pChildInfo->image.path.size()+1;
         }
 
@@ -143 +144 @@
     BYTE *pByte;
     int i2,i3,WndInfoNum;
-    CHILDINFO ChildInfo;
-    char temporary[255];
+    ActiveBasic::PM::ChildWindowInfo ChildInfo;
 
     for(i2=1;i2<MAX_RAD_SELITEM;i2++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i2]=-1;
@@ -155 +155 @@
     for(i3--;i3>=0;i3--){
         //IdNameメンバは変更される可能性がある
-        ChildInfo.IdName=(char *)temporary;
-        lstrcpy(ChildInfo.IdName,(char *)pByte+i2);
-        i2+=lstrlen(ChildInfo.IdName)+1;
+        ChildInfo.SetName( (char *)pByte+i2 );
+        i2 += ChildInfo.GetName().size()+1;
 
         memcpy(&ChildInfo.pos,pByte+i2,sizeof(POINT));
@@ -165 +164 @@
         i2+=sizeof(SIZE);
 
-        ChildInfo.caption=(char *)pByte+i2;
-        i2+=lstrlen(ChildInfo.caption)+1;
-
-        memcpy(&ChildInfo.style,pByte+i2,sizeof(DWORD));
+        ChildInfo.SetCaption( (char *)pByte+i2 );
+        i2+=ChildInfo.GetCaption().size()+1;
+
+        ChildInfo.SetStyle( *(DWORD *)(pByte+i2) );
         i2+=sizeof(DWORD);
 
-        memcpy(&ChildInfo.ExStyle,pByte+i2,sizeof(DWORD));
+        ChildInfo.SetExStyle( *(DWORD *)(pByte+i2) );
         i2+=sizeof(DWORD);
 
@@ -177 +176 @@
         i2+=sizeof(int);
 
-        memcpy(&ChildInfo.ImageCtrlInfo.type,pByte+i2,sizeof(int));
+        memcpy(&ChildInfo.image.type,pByte+i2,sizeof(int));
         i2+=sizeof(int);
 
-        ChildInfo.ImageCtrlInfo.path=(char *)pByte+i2;
-        if(lstrlen(ChildInfo.ImageCtrlInfo.path)==0){
-            ChildInfo.ImageCtrlInfo.path=0;
-            i2++;
-        }
-        else i2+=lstrlen(ChildInfo.ImageCtrlInfo.path)+1;
+        ChildInfo.image.path = (char *)pByte+i2;
+        i2+=ChildInfo.image.path.size()+1;
 
         ChildInfo.pos.x+=17;
@@ -195 +190 @@
             &ChildInfo.pos,
             &ChildInfo.size,
-            ChildInfo.IdName,
-            ChildInfo.caption,
-            ChildInfo.style,
-            ChildInfo.ExStyle,
+            ChildInfo.GetName().c_str(),
+            ChildInfo.GetCaption().c_str(),
+            ChildInfo.GetStyle(),
+            ChildInfo.GetExStyle(),
             ChildInfo.Control,
-            ChildInfo.ImageCtrlInfo.type,
-            ChildInfo.ImageCtrlInfo.path,
+            ChildInfo.image.type,
+            ChildInfo.image.path.c_str(),
             2);
     }
@@ -210 +205 @@
 }
 
-char *FormatCaption(char *caption){
+char *FormatCaption(const char *caption){
     extern HANDLE hHeap;
     int i2,i3,BufSize;
@@ -234 +229 @@
     return buffer;
 }
-char *SetCaptionSequence(char *caption){
+char *SetCaptionSequence(const char *caption){
     extern HANDLE hHeap;
     int i2,i3,BufSize;
@@ -351 +346 @@
     return 1;
 }
-BOOL GetNotifyCommandByItemMessage(WindowInfo *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
+BOOL GetNotifyCommandByItemMessage(ActiveBasic::PM::WindowInfo *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
     int i,i2,i3,sw;
     char temporary[MAX_PATH];
@@ -432 +427 @@
     }
 }
-void GetCommandByItemMessage(WindowInfo *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
+void GetCommandByItemMessage(ActiveBasic::PM::WindowInfo *pWindowInfo,ITEMEVENTINFO *pItemEventInfo,char *Command,char *spaces){
     extern HANDLE hHeap;
     int i,i2,i3;
@@ -526 +521 @@
     char temporary[MAX_PATH],*temp2;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     Command[0]=0;
@@ -548 +543 @@
         i+=lstrlen(Command+i);
 
-        if(pWindowInfo->MenuID){
+        if( pWindowInfo->HasMenu() )
+        {
             //メニュー作成
             for(i2=0;i2<projectInfo.NumberOfMenu;i2++){
-                if(lstrcmpi(projectInfo.pMenuInfo[i2].IdName,pWindowInfo->MenuID)==0) break;
+                if(lstrcmpi(projectInfo.pMenuInfo[i2].IdName,pWindowInfo->GetMenuIdName().c_str())==0) break;
             }
             if(i2!=projectInfo.NumberOfMenu){
@@ -561 +557 @@
         //子ウィンドウ作成
         sw = 0;
-        BOOST_FOREACH( const CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+        BOOST_FOREACH( const ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
         {
             if(pChildInfo->Control==CT_UPDOWN){
                 sprintf(Command+i,"%s\tCreateUpDownControl(%d,%d,%d,%d,%d,hWnd,%s,GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,0,0,100,0)\r\n",
                     spaces,
-                    pChildInfo->style,
+                    pChildInfo->GetStyle(),
                     pChildInfo->pos.x,pChildInfo->pos.y,
                     pChildInfo->size.cx,pChildInfo->size.cy,
-                    pChildInfo->IdName);
+                    pChildInfo->GetName().c_str());
                 i+=lstrlen(Command+i);
             }
             else{
                 GetItemClassName(temporary,pChildInfo->Control);
-                temp2=FormatCaption(pChildInfo->caption);
+                temp2=FormatCaption(pChildInfo->GetCaption().c_str());
                 sprintf(Command+i,"%s\tCreateWindowEx(&H%08x,\"%s\",\"%s\",&H%08x,%d,%d,%d,%d,hWnd,%s As HMENU,GetModuleHandle(0),0)\r\n",
                     spaces,
-                    pChildInfo->ExStyle,
+                    pChildInfo->GetExStyle(),
                     temporary,
                     temp2,
-                    pChildInfo->style,
+                    pChildInfo->GetStyle(),
                     pChildInfo->pos.x,
                     pChildInfo->pos.y,
                     pChildInfo->size.cx,
                     pChildInfo->size.cy,
-                    pChildInfo->IdName);
+                    pChildInfo->GetName().c_str());
                 i+=lstrlen(Command+i);
                 HeapDefaultFree(temp2);
                 sprintf(Command+i,"%s\tSendMessage(GetDlgItem(hWnd,%s),WM_SETFONT,hFont_%s As WPARAM,0)\r\n",
                     spaces,
-                    pChildInfo->IdName,
+                    pChildInfo->GetName().c_str(),
                     pWindowInfo->GetName().c_str());
                 i+=lstrlen(Command+i);
@@ -596 +592 @@
                 if(pChildInfo->Control==CT_IMAGEBOX){
                     //イメージ ボックスの場合
-                    if((pChildInfo->style&0x000F)==SS_ICON){
-                        if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_FILE){
-                            if(strstr(pChildInfo->ImageCtrlInfo.path,":")||
-                                strstr(pChildInfo->ImageCtrlInfo.path,"\\\\")){
+                    if((pChildInfo->GetStyle()&0x000F)==SS_ICON){
+                        if(pChildInfo->image.IsFile()){
+                            if(strstr(pChildInfo->image.path.c_str(),":")||
+                                strstr(pChildInfo->image.path.c_str(),"\\\\")){
                                 sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,\"%s\",IMAGE_ICON,0,0,LR_DEFAULTSIZE or LR_LOADFROMFILE)\r\n",
                                     spaces,
                                     pWindowInfo->GetName().c_str(),
-                                    pChildInfo->IdName,
-                                    pChildInfo->ImageCtrlInfo.path);
+                                    pChildInfo->GetName().c_str(),
+                                    pChildInfo->image.path.c_str());
                             }
                             else{
@@ -628 +624 @@
                                     i+=2;
                                 }
-                                sprintf(Command+i,"%s\twsprintf(ImageFilePath,\"%%s%s\",ModulePath)\r\n",spaces,pChildInfo->ImageCtrlInfo.path);
+                                sprintf(Command+i,"%s\twsprintf(ImageFilePath,\"%%s%s\",ModulePath)\r\n",spaces,pChildInfo->image.path.c_str());
                                 i+=lstrlen(Command+i);
                                 sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,ImageFilePath,IMAGE_ICON,0,0,LR_DEFAULTSIZE or LR_LOADFROMFILE)\r\n",
                                     spaces,
                                     pWindowInfo->GetName().c_str(),
-                                    pChildInfo->IdName);
+                                    pChildInfo->GetName().c_str());
                             }
                             i+=lstrlen(Command+i);
                         }
-                        else if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_RES){
+                        else if(pChildInfo->image.IsResource()){
                             sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,%s As *Byte,IMAGE_ICON,0,0,LR_DEFAULTSIZE)\r\n",
                                 spaces,
                                 pWindowInfo->GetName().c_str(),
-                                pChildInfo->IdName,
-                                pChildInfo->ImageCtrlInfo.path);
+                                pChildInfo->GetName().c_str(),
+                                pChildInfo->image.path.c_str());
                             i+=lstrlen(Command+i);
                         }
                         sprintf(Command+i,"%s\tSendMessage(GetDlgItem(hWnd,%s),STM_SETICON,hImage_%s_%s As WPARAM,0)\r\n",
                             spaces,
-                            pChildInfo->IdName,
+                            pChildInfo->GetName().c_str(),
                             pWindowInfo->GetName().c_str(),
-                            pChildInfo->IdName);
+                            pChildInfo->GetName().c_str());
                         i+=lstrlen(Command+i);
                     }
-                    else if((pChildInfo->style&0x000F)==SS_BITMAP){
-                        if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_FILE){
-                            if(strstr(pChildInfo->ImageCtrlInfo.path,":")||
-                                strstr(pChildInfo->ImageCtrlInfo.path,"\\\\")){
+                    else if((pChildInfo->GetStyle()&0x000F)==SS_BITMAP){
+                        if(pChildInfo->image.IsFile()){
+                            if(strstr(pChildInfo->image.path.c_str(),":")||
+                                strstr(pChildInfo->image.path.c_str(),"\\\\")){
                                 sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,\"%s\",IMAGE_BITMAP,0,0,LR_DEFAULTSIZE or LR_LOADFROMFILE)\r\n",
                                     spaces,
                                     pWindowInfo->GetName().c_str(),
-                                    pChildInfo->IdName,
-                                    pChildInfo->ImageCtrlInfo.path);
+                                    pChildInfo->GetName().c_str(),
+                                    pChildInfo->image.path.c_str());
                             }
                             else{
@@ -684 +680 @@
                                     i+=2;
                                 }
-                                sprintf(Command+i,"%s\twsprintf(ImageFilePath,\"%%s%s\",ModulePath)\r\n",spaces,pChildInfo->ImageCtrlInfo.path);
+                                sprintf(Command+i,"%s\twsprintf(ImageFilePath,\"%%s%s\",ModulePath)\r\n",spaces,pChildInfo->image.path.c_str());
                                 i+=lstrlen(Command+i);
                                 sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,ImageFilePath,IMAGE_BITMAP,0,0,LR_LOADFROMFILE)\r\n",
                                     spaces,
                                     pWindowInfo->GetName().c_str(),
-                                    pChildInfo->IdName);
+                                    pChildInfo->GetName().c_str());
                             }
                             i+=lstrlen(Command+i);
                         }
-                        else if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_RES){
+                        else if(pChildInfo->image.IsResource()){
                             sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,%s As *Byte,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE)\r\n",
                                 spaces,
                                 pWindowInfo->GetName().c_str(),
-                                pChildInfo->IdName,
-                                pChildInfo->ImageCtrlInfo.path);
+                                pChildInfo->GetName().c_str(),
+                                pChildInfo->image.path.c_str());
                             i+=lstrlen(Command+i);
                         }
                         sprintf(Command+i,"%s\tSendMessage(GetDlgItem(hWnd,%s),STM_SETIMAGE,IMAGE_BITMAP,hImage_%s_%s As LPARAM)\r\n",
                             spaces,
-                            pChildInfo->IdName,
+                            pChildInfo->GetName().c_str(),
                             pWindowInfo->GetName().c_str(),
-                            pChildInfo->IdName);
+                            pChildInfo->GetName().c_str());
                         i+=lstrlen(Command+i);
                     }
@@ -724 +720 @@
         }
 
-        if(pWindowInfo->MenuID){
+        if( pWindowInfo->HasMenu() )
+        {
             //メニューを解放
             for(i2=0;i2<projectInfo.NumberOfMenu;i2++){
-                if(lstrcmpi(projectInfo.pMenuInfo[i2].IdName,pWindowInfo->MenuID)==0) break;
+                if(lstrcmpi(projectInfo.pMenuInfo[i2].IdName,pWindowInfo->GetMenuIdName().c_str())==0) break;
             }
             if(i2!=projectInfo.NumberOfMenu){
@@ -736 +733 @@
 
         //イメージ ボックス用の変数を解放
-        BOOST_FOREACH( const CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+        BOOST_FOREACH( const ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
         {
             if(pChildInfo->Control==CT_IMAGEBOX){
-                if((pChildInfo->style&0x000F)==SS_ICON)
-                    sprintf(Command+i,"%s\tDestroyIcon(hImage_%s_%s)\r\n",spaces,pWindowInfo->GetName().c_str(),pChildInfo->IdName);
-                else if((pChildInfo->style&0x000F)==SS_BITMAP)
-                    sprintf(Command+i,"%s\tDeleteObject(hImage_%s_%s)\r\n",spaces,pWindowInfo->GetName().c_str(),pChildInfo->IdName);
+                if((pChildInfo->GetStyle()&0x000F)==SS_ICON)
+                    sprintf(Command+i,"%s\tDestroyIcon(hImage_%s_%s)\r\n",spaces,pWindowInfo->GetName().c_str(),pChildInfo->GetName().c_str());
+                else if((pChildInfo->GetStyle()&0x000F)==SS_BITMAP)
+                    sprintf(Command+i,"%s\tDeleteObject(hImage_%s_%s)\r\n",spaces,pWindowInfo->GetName().c_str(),pChildInfo->GetName().c_str());
                 i+=lstrlen(Command+i);
             }
@@ -894 +891 @@
 }
 
-char **GetMenuItemConstData(MENU_INFO *pMenuInfo,int NumberOfMenu,int *ConstNumber,char **ppNames,int *NamesNum,char *buffer,int *base){
+void GetMenuItemConstData(MENU_INFO *pMenuInfo,int NumberOfMenu,int *ConstNumber,Jenga::Common::Strings &namesForDuplicationCheck,char *buffer,int *base){
     extern HANDLE hHeap;
-    int i,i2,sw1;
+    int i;
 
     for(i=0;i<NumberOfMenu;i++){
         if(pMenuInfo[i].pMenuInfo){
             //ポップアップ
-            ppNames=GetMenuItemConstData(pMenuInfo[i].pMenuInfo,pMenuInfo[i].NumberOfMenu,ConstNumber,ppNames,NamesNum,buffer,base);
+            GetMenuItemConstData(pMenuInfo[i].pMenuInfo,pMenuInfo[i].NumberOfMenu,ConstNumber,namesForDuplicationCheck,buffer,base);
         }
         else if(pMenuInfo[i].type==MFT_STRING){
             //重複チェック
-            for(i2=0,sw1=0;i2<*NamesNum;i2++){
-                if(lstrcmpi(ppNames[i2],pMenuInfo[i].IdName)==0){
-                    sw1=1;
+            bool isMatch = false;
+            BOOST_FOREACH( const std::string &name, namesForDuplicationCheck )
+            {
+                if(lstrcmpi(name.c_str(),pMenuInfo[i].IdName)==0)
+                {
+                    isMatch = true;
                     break;
                 }
             }
-            if(sw1==0){
-                ppNames=(char **)HeapReAlloc(hHeap,0,ppNames,sizeof(char *)*((*NamesNum)+1));
-                ppNames[*NamesNum]=pMenuInfo[i].IdName;
-                (*NamesNum)++;
+            if( !isMatch )
+            {
+                namesForDuplicationCheck.push_back( pMenuInfo[i].IdName );
 
                 sprintf(buffer+(*base),"Const %s=%d\r\n",pMenuInfo[i].IdName,*ConstNumber);
@@ -922 +921 @@
         }
     }
-    return ppNames;
 }
 int GetMakeMenuCommand(MENU_INFO *pMenuInfo,int NumberOfMenu,char *MenuHandle,char *Command,BOOL bMain){
@@ -982 +980 @@
 void SaveWindowProgram(){
     extern HANDLE hHeap;
-    int i,i2,i3,i4,i5,i6,sw1,sw2,sw3,sw4,size;
-    char *buffer,**ppNames,temporary[MAX_PATH];
+    int i,i2,i3,i4,i5,sw1,sw2,sw3,sw4,size;
+    char *buffer,temporary[MAX_PATH];
 
     size=2;
@@ -1006 +1004 @@
     //IDを定義
 
-    ppNames=(char **)HeapAlloc(hHeap,0,1);
+    Jenga::Common::Strings namesForDuplicationCheck;
     i4=1000;
     i5=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        BOOST_FOREACH( const CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+        BOOST_FOREACH( const ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
         {
             //重複チェック
-            for(i6=0,sw1=0;i6<i5;i6++){
-                if(lstrcmpi(ppNames[i6],pChildInfo->IdName)==0){
-                    sw1=1;
+            bool isMatch = false;
+            BOOST_FOREACH( const std::string &name, namesForDuplicationCheck )
+            {
+                if(lstrcmpi(name.c_str(),pChildInfo->GetName().c_str())==0){
+                    isMatch = true;
                     break;
                 }
             }
-            if(sw1) continue;
-
-            ppNames=(char **)HeapReAlloc(hHeap,0,ppNames,sizeof(char *)*(i5+1));
-            ppNames[i5]=pChildInfo->IdName;
-            i5++;
-
-            sprintf(buffer+i2,"Const %s=%d\r\n",pChildInfo->IdName,i4);
+            if( isMatch ) continue;
+
+            namesForDuplicationCheck.push_back( pChildInfo->GetName() );
+
+            sprintf(buffer+i2,"Const %s=%d\r\n",pChildInfo->GetName().c_str(),i4);
             i2+=lstrlen(buffer+i2);
             i4++;
@@ -1038 +1036 @@
 
     //メニューのIDを定義
-    ppNames=GetMenuItemConstData(projectInfo.pMenuInfo,projectInfo.NumberOfMenu,&i4,ppNames,&i5,buffer,&i2);
-
-    HeapDefaultFree(ppNames);
+    GetMenuItemConstData(projectInfo.pMenuInfo,projectInfo.NumberOfMenu,&i4,namesForDuplicationCheck,buffer,&i2);
+
     lstrcpy(buffer+i2,"\r\n");
     i2+=lstrlen(buffer+i2);
@@ -1046 +1043 @@
 
     //ハンドル変数を定義
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         sprintf(buffer+i2,"Dim %s As HWND\r\n",pWindowInfo->GetHandleName().c_str());
@@ -1082 +1079 @@
     i2+=lstrlen(buffer+i2);
     i=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        if(pWindowInfo->bgColor<=0&&
-            pWindowInfo->bgColor!=-(int)RGB(255,255,255)&&
-            pWindowInfo->bgColor!=-(int)RGB(0,0,0)){
+        if(pWindowInfo->GetBackgroundColor()<=0&&
+            pWindowInfo->GetBackgroundColor()!=-(int)RGB(255,255,255)&&
+            pWindowInfo->GetBackgroundColor()!=-(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,-pWindowInfo->bgColor);
+                sprintf(buffer+i2,"_RadSys_hBackBrush%d=CreateSolidBrush(%d)\r\n",i,-pWindowInfo->GetBackgroundColor());
                 i2+=lstrlen(buffer+i2);
         }
-        if(pWindowInfo->bgColor>=0x1000){
+        if(pWindowInfo->GetBackgroundColor()>=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.resourceManager.bitmapResources[pWindowInfo->bgColor-0x1000].idName.c_str());
+                    projectInfo.resourceManager.bitmapResources[pWindowInfo->GetBackgroundColor()-0x1000].idName.c_str());
                 i2+=lstrlen(buffer+i2);
         }
@@ -1108 +1105 @@
 
     //イメージ ボックス用の変数を定義
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        BOOST_FOREACH( const CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+        BOOST_FOREACH( const ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
         {
             if(pChildInfo->Control==CT_IMAGEBOX){
-                if((pChildInfo->style&0x000F)==SS_ICON||
-                    (pChildInfo->style&0x000F)==SS_BITMAP){
-                    sprintf(buffer+i2,"Dim hImage_%s_%s As HANDLE\r\n",pWindowInfo->GetName().c_str(),pChildInfo->IdName);
+                if((pChildInfo->GetStyle()&0x000F)==SS_ICON||
+                    (pChildInfo->GetStyle()&0x000F)==SS_BITMAP){
+                    sprintf(buffer+i2,"Dim hImage_%s_%s As HANDLE\r\n",pWindowInfo->GetName().c_str(),pChildInfo->GetName().c_str());
                     i2+=lstrlen(buffer+i2);
 
@@ -1163 +1160 @@
     }
 
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         //フォントハンドル解放
@@ -1179 +1176 @@
     i2+=lstrlen(buffer+i2);
     i=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        if(pWindowInfo->bgColor<=0&&
-            pWindowInfo->bgColor!=-(int)RGB(255,255,255)&&
-            pWindowInfo->bgColor!=-(int)RGB(0,0,0)){
+        if(pWindowInfo->GetBackgroundColor()<=0&&
+            pWindowInfo->GetBackgroundColor()!=-(int)RGB(255,255,255)&&
+            pWindowInfo->GetBackgroundColor()!=-(int)RGB(0,0,0)){
                 sprintf(buffer+i2,"\tDeleteObject(_RadSys_hBackBrush%d)\r\n",i);
                 i2+=lstrlen(buffer+i2);
@@ -1198 +1195 @@
 
     i=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         if(i!=0){
@@ -1210 +1207 @@
         //処理メッセージを抽出
         ITEMEVENTINFO *pItemEventInfo;
-        ppNames=GetProcedureNamesOfMessageCall(i,&pItemEventInfo,&i3,&bAvailUserProc[i]);
+        char **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",pWindowInfo->GetName().c_str());
@@ -1363 +1360 @@
     sw1=0;
     i=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         if(pWindowInfo->type==WNDTYPE_MODALDLG){
@@ -1375 +1372 @@
                 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",
+            sprintf(buffer+i2,"\t\t%s=CreateWindowEx(&H%08x,\"NORMALDLG\",\"%s\",&H%08x,%d,%d,%d,%d,hOwnerWnd,NULL As HMENU,GetModuleHandle(0),0)\r\n",
                 pWindowInfo->GetHandleName().c_str(),
-                pWindowInfo->ExStyle,
-                pWindowInfo->caption,
-                pWindowInfo->style,
+                pWindowInfo->GetExStyle(),
+                pWindowInfo->GetCaption().c_str(),
+                pWindowInfo->GetStyle(),
                 pWindowInfo->pos.x,
                 pWindowInfo->pos.y,
                 pWindowInfo->size.cx,
-                pWindowInfo->size.cy,
-                pWindowInfo->id);
+                pWindowInfo->size.cy);
             i2+=lstrlen(buffer+i2);
             sprintf(buffer+i2,"\t\thDlg=%s\r\n",
@@ -1402 +1398 @@
             sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->GetHandleName().c_str());
             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->GetHandleName().c_str(),pWindowInfo->IconResName);
+            if( pWindowInfo->HasIcon() )
+            {
+                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->GetHandleName().c_str(),pWindowInfo->GetIconResourceName().c_str());
                 i2+=lstrlen(buffer+i2);
             }
@@ -1462 +1459 @@
     i2+=lstrlen(buffer+i2);
     i=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         if(pWindowInfo->type==WNDTYPE_MODELESSDLG){
@@ -1468 +1465 @@
             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",
+            sprintf(buffer+i2,"\t\t%s=CreateWindowEx(&H%08x,\"NORMALDLG\",\"%s\",&H%08x,%d,%d,%d,%d,hOwnerWnd,NULL As HMENU,GetModuleHandle(0),0)\r\n",
                 pWindowInfo->GetHandleName().c_str(),
-                pWindowInfo->ExStyle,
-                pWindowInfo->caption,
-                pWindowInfo->style,
+                pWindowInfo->GetExStyle(),
+                pWindowInfo->GetCaption().c_str(),
+                pWindowInfo->GetStyle(),
                 pWindowInfo->pos.x,
                 pWindowInfo->pos.y,
                 pWindowInfo->size.cx,
-                pWindowInfo->size.cy,
-                pWindowInfo->id);
+                pWindowInfo->size.cy);
             i2+=lstrlen(buffer+i2);
             sprintf(buffer+i2,"\t\tCreateDialog=%s\r\n",pWindowInfo->GetHandleName().c_str());
@@ -1494 +1490 @@
             sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->GetHandleName().c_str());
             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->GetHandleName().c_str(),pWindowInfo->IconResName);
+            if( pWindowInfo->HasIcon() )
+            {
+                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->GetHandleName().c_str(),pWindowInfo->GetIconResourceName().c_str());
                 i2+=lstrlen(buffer+i2);
             }
@@ -1535 +1532 @@
 
     i=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         if(pWindowInfo->type==WNDTYPE_DEFAULT){
@@ -1544 +1541 @@
             i2+=2;
 
-            if(pWindowInfo->IconResName==0){
+            if( pWindowInfo->HasIcon() )
+            {
+                sprintf(buffer+i2,"_RadSys_wcl.hIcon=LoadIcon(_RadSys_wcl.hInstance,MAKEINTRESOURCE(%s))\r\n",pWindowInfo->GetIconResourceName().c_str());
+                i2+=lstrlen(buffer+i2);
+                sprintf(buffer+i2,"_RadSys_wcl.hIconSm=LoadIcon(_RadSys_wcl.hInstance,MAKEINTRESOURCE(%s))\r\n",pWindowInfo->GetIconResourceName().c_str());
+                i2+=lstrlen(buffer+i2);
+            }
+            else{
                 lstrcpy(buffer+i2,"_RadSys_wcl.hIcon=LoadIcon(NULL,MAKEINTRESOURCE(IDI_APPLICATION))\r\n");
                 i2+=lstrlen(buffer+i2);
@@ -1550 +1554 @@
                 i2+=lstrlen(buffer+i2);
             }
-            else{
-                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",pWindowInfo->IconResName);
-                i2+=lstrlen(buffer+i2);
-            }
 
             sprintf(buffer+i2,"_RadSys_wcl.lpszClassName=\"NORMAL%d\"\r\n",i);
@@ -1563 +1561 @@
             else sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(EventCall_%s)\r\n",pWindowInfo->GetName().c_str());
             i2+=lstrlen(buffer+i2);
-            if(pWindowInfo->bgColor==COLOR_3DFACE)
+            if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE)
                 lstrcpy(buffer+i2,"_RadSys_wcl.hbrBackground=h3DFaceBrush\r\n");
-            else if(pWindowInfo->bgColor==-(int)RGB(255,255,255))
+            else if(pWindowInfo->GetBackgroundColor()==-(int)RGB(255,255,255))
                 lstrcpy(buffer+i2,"_RadSys_wcl.hbrBackground=GetStockObject(WHITE_BRUSH)\r\n");
-            else if(pWindowInfo->bgColor==-(int)RGB(0,0,0))
+            else if(pWindowInfo->GetBackgroundColor()==-(int)RGB(0,0,0))
                 lstrcpy(buffer+i2,"_RadSys_wcl.hbrBackground=GetStockObject(BLACK_BRUSH)\r\n");
-            else if(pWindowInfo->bgColor<=0||
-                pWindowInfo->bgColor>=0x1000){
+            else if(pWindowInfo->GetBackgroundColor()<=0||
+                pWindowInfo->GetBackgroundColor()>=0x1000){
                 //色指定またはビットマップ
                 sprintf(buffer+i2,"_RadSys_wcl.hbrBackground=_RadSys_hBackBrush%d\r\n",i);
@@ -1578 +1576 @@
             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",
-                pWindowInfo->ExStyle,
-                pWindowInfo->ClassName,i,
-                pWindowInfo->caption,
-                pWindowInfo->style,
+                pWindowInfo->GetExStyle(),
+                pWindowInfo->GetClassName().c_str(), i,
+                pWindowInfo->GetCaption().c_str(),
+                pWindowInfo->GetStyle(),
                 pWindowInfo->pos.x,
                 pWindowInfo->pos.y,
@@ -1630 +1628 @@
     return i2;
 }
-void SaveWindowFile( char *path, const WindowInfos &windowInfos )
+void SaveWindowFile( char *path, const ActiveBasic::PM::WindowInfos &windowInfos )
 {
     extern HANDLE hHeap;
@@ -1640 +1638 @@
     buffer=(char *)HeapAlloc(hHeap,0,GENERAL_SIZE*size);
     i2=0;
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         sprintf(buffer+i2,"WINDOW:%s\r\n",pWindowInfo->GetName().c_str());
@@ -1650 +1648 @@
         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);
+        sprintf(buffer+i2,"    CAPTION   = \"%s\"\r\n",pWindowInfo->GetCaption().c_str());
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    STYLE     = &H%08x\r\n",pWindowInfo->GetStyle());
+        i2+=lstrlen(buffer+i2);
+        sprintf(buffer+i2,"    EXSTYLE   = &H%08x\r\n",pWindowInfo->GetExStyle());
+        i2+=lstrlen(buffer+i2);
+        if( pWindowInfo->HasMenu() )
+        {
+            sprintf(buffer+i2,"    MENUID    = %s\r\n",pWindowInfo->GetMenuIdName().c_str());
+            i2+=lstrlen(buffer+i2);
+        }
+        sprintf(buffer+i2,"    BGCOLOR   = %d\r\n",pWindowInfo->GetBackgroundColor());
         i2+=lstrlen(buffer+i2);
         sprintf(buffer+i2,"    FONT      = %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,\"%s\"\r\n",
@@ -1680 +1677 @@
             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);
+        if( pWindowInfo->HasIcon() )
+        {
+            sprintf(buffer+i2,"    ICONID    = %s\r\n",pWindowInfo->GetIconResourceName().c_str());
+            i2+=lstrlen(buffer+i2);
+        }
+        sprintf(buffer+i2,"    CLASS     = \"%s\"\r\n",pWindowInfo->GetClassName().c_str());
         i2+=lstrlen(buffer+i2);
         sprintf(buffer+i2,"    CALLBACK  = %s\r\n",pWindowInfo->CallBackName);
@@ -1692 +1690 @@
         sprintf(buffer+i2,"    FILEPATH  = %s\r\n",pWindowInfo->filepath);
         i2+=lstrlen(buffer+i2);
-        BOOST_FOREACH( const CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+        BOOST_FOREACH( const ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
         {
-            temporary=SetCaptionSequence(pChildInfo->caption);
+            temporary=SetCaptionSequence(pChildInfo->GetCaption().c_str());
             sprintf(buffer+i2,"    ITEM      = %s,%d,%d,%d,%d,\"%s\",&H%08x,&H%08x,%d",
-                pChildInfo->IdName,
+                pChildInfo->GetName().c_str(),
                 pChildInfo->pos.x,pChildInfo->pos.y,
                 pChildInfo->size.cx,pChildInfo->size.cy,
                 temporary,
-                pChildInfo->style,
-                pChildInfo->ExStyle,
+                pChildInfo->GetStyle(),
+                pChildInfo->GetExStyle(),
                 pChildInfo->Control
             );
@@ -1707 +1705 @@
             HeapDefaultFree(temporary);
             if(pChildInfo->Control==CT_IMAGEBOX){
-                sprintf(buffer+i2,",%d,\"%s\"",pChildInfo->ImageCtrlInfo.type,pChildInfo->ImageCtrlInfo.path);
+                sprintf(buffer+i2,",%d,\"%s\"",pChildInfo->image.type,pChildInfo->image.path.c_str());
                 i2+=lstrlen(buffer+i2);
             }
@@ -1883 +1881 @@
             //ウィンドウ
             if(lstrcmpi(temporary,"WINDOW")==0&&i3==0){
-                projectInfo.windowInfos.push_back( new WindowInfo() );
+                projectInfo.windowInfos.push_back( new ActiveBasic::PM::WindowInfo() );
                 i3=1;
 
@@ -1906 +1904 @@
                 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()->SetCaption( 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()->SetStyle( GetValue(temp2) );
+            else if(lstrcmpi(temporary,"EXSTYLE")==0&&i3==1) projectInfo.windowInfos.back()->SetExStyle( 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()->SetMenuIdName( temp2 );
+            }
+            else if(lstrcmpi(temporary,"ID")==0&&i3==1)
+            {
+                // 無視
+            }
             else if(lstrcmpi(temporary,"BGCOLOR")==0&&i3==1){
-                projectInfo.windowInfos.back()->bgColor=GetValue(temp2);
+                projectInfo.windowInfos.back()->SetBackgroundColor( 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()->GetBackgroundColor()==-1)
+                        projectInfo.windowInfos.back()->SetBackgroundColor( -(int)RGB(255,255,255) );
                 }
             }
@@ -1970 +1969 @@
             }
             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()->SetIconResourceName( 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()->SetClassName( temp2+1 );
                 }
             }
@@ -1994 +1991 @@
             }
             else if(lstrcmpi(temporary,"ITEM")==0&&i3==1){
-                CHILDINFO *pChildInfo = new CHILDINFO();
+                ActiveBasic::PM::ChildWindowInfo *pChildInfo = new ActiveBasic::PM::ChildWindowInfo();
 
                 //ID
                 i5=GetOneParameter(temp2,0,temp3);
-                pChildInfo->IdName=(char *)HeapAlloc(hHeap,0,lstrlen(temp3)+1);
-                lstrcpy(pChildInfo->IdName,temp3);
+                pChildInfo->SetName( temp3 );
 
                 //位置
@@ -2015 +2011 @@
                 RemoveStringQuotes(temp3);
                 RestoreCaptionSequence(temp3);
-                pChildInfo->caption=(char *)HeapAlloc(hHeap,0,lstrlen(temp3)+1);
-                lstrcpy(pChildInfo->caption,temp3);
+                pChildInfo->SetCaption( temp3 );
 
                 //スタイル
                 i5=GetOneParameter(temp2,i5,temp3);
-                pChildInfo->style=GetValue(temp3);
+                pChildInfo->SetStyle( GetValue(temp3) );
 
                 //拡張スタイル
                 i5=GetOneParameter(temp2,i5,temp3);
-                pChildInfo->ExStyle=GetValue(temp3);
+                pChildInfo->SetExStyle( GetValue(temp3) );
 
                 //クラス
@@ -2033 +2028 @@
                     //イメージ ボックスの場合
                     i5=GetOneParameter(temp2,i5,temp3);
-                    pChildInfo->ImageCtrlInfo.type=GetValue(temp3);
+                    pChildInfo->image.type = (ActiveBasic::PM::ImageReferenceType::EnumType)GetValue(temp3);
                     i5=GetOneParameter(temp2,i5,temp3);
                     RemoveStringQuotes(temp3);
-                    pChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,0,lstrlen(temp3)+1);
-                    lstrcpy(pChildInfo->ImageCtrlInfo.path,temp3);
+                    pChildInfo->image.path = temp3;
                 }
 
@@ -2177 +2171 @@
         return;
     }
-    BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
         if(lstrcmpi(NewWindow.name,pWindowInfo->GetName().c_str())==0){
@@ -2200 +2194 @@
 
     //projectInfo.windowInfos構造体コレクションに追加
-    projectInfo.windowInfos.push_back( new WindowInfo() );
+    projectInfo.windowInfos.push_back( new ActiveBasic::PM::WindowInfo() );
 
 
@@ -2219 +2213 @@
 
     //ウィンドウテキスト
-    projectInfo.windowInfos.back()->caption=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.name)+1);
-    lstrcpy(projectInfo.windowInfos.back()->caption,NewWindow.name);
+    projectInfo.windowInfos.back()->SetCaption( NewWindow.name );
 
     //スタイル
@@ -2226 +2219 @@
         case WNDTYPE_DEFAULT:
             //通常ウィンドウ
-            projectInfo.windowInfos.back()->style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX;
+            projectInfo.windowInfos.back()->SetStyle( 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()->SetStyle( WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU );
             break;
     }
 
     //拡張スタイル
-    projectInfo.windowInfos.back()->ExStyle=0;
+    projectInfo.windowInfos.back()->SetExStyle( 0 );
 
     //メニュー
-    projectInfo.windowInfos.back()->MenuID=0;
-
-    //ID
-    projectInfo.windowInfos.back()->id=0;
+    projectInfo.windowInfos.back()->SetMenuIdName( "" );
 
     //背景色
-    projectInfo.windowInfos.back()->bgColor=COLOR_3DFACE;
+    projectInfo.windowInfos.back()->SetBackgroundColor( COLOR_3DFACE );
 
     //フォント
@@ -2251 +2241 @@
 
     //アイコン
-    projectInfo.windowInfos.back()->IconResName=0;
+    projectInfo.windowInfos.back()->SetIconResourceName( "" );
 
     //クラス名
     lstrcpy(temporary,"NORMAL");
-    projectInfo.windowInfos.back()->ClassName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(projectInfo.windowInfos.back()->ClassName,temporary);
+    projectInfo.windowInfos.back()->SetClassName( temporary );
 
     //コールバック関数名
@@ -2323 +2312 @@
     int i;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     //ウィンドウが開かれている場合は閉じる
@@ -2335 +2324 @@
     //ウィンドウ情報のメモリを解放
     HeapDefaultFree(pWindowInfo->filepath);
-    HeapDefaultFree(pWindowInfo->caption);
-    HeapDefaultFree(pWindowInfo->ClassName);
     HeapDefaultFree(pWindowInfo->CallBackName);
 
     //子ウィンドウのメモリを解放
-    for(i=0;i<pWindowInfo->childWindowInfos.size();i++){
-        HeapDefaultFree(pWindowInfo->childWindowInfos[i]->IdName);
-        HeapDefaultFree(pWindowInfo->childWindowInfos[i]->caption);
-        delete pWindowInfo->childWindowInfos[i];
+    BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildWindowInfo, pWindowInfo->childWindowInfos )
+    {
+        delete pChildWindowInfo;
     }
     pWindowInfo->childWindowInfos.clear();

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

@@ -256 +256 @@
         ////////////////
 
-        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+        ActiveBasic::PM::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.h

@@ -71 +71 @@
 //プロジェクト情報
 NEWPROJECTINFO NewProjectInfo;
-ActiveBasic::IDE::Project projectInfo;
+ActiveBasic::PM::Project projectInfo;
 HWND hProjectView;      //プロジェクト ビュー
 HWND hProjectView_ToolWindow;

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

@@ -2 +2 @@
 
 
-namespace ActiveBasic{ namespace IDE{
+namespace ActiveBasic{ namespace PM{
 
 class Project
@@ -83 +83 @@
 }}
 
-extern ActiveBasic::IDE::Project projectInfo;
+extern ActiveBasic::PM::Project projectInfo;

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

@@ -2 +2 @@
 
 
-namespace ActiveBasic{ namespace IDE{
-
-/*
+namespace ActiveBasic{ namespace PM{
+
+
 struct ImageReferenceType
 {
@@ -14 +14 @@
 };
 
-struct IMAGECTRLINFO
-{
+class ImageControlInfo
+{
+public:
     ImageReferenceType::EnumType type;
     std::string path;
-};
-*/
-
-}}
-
-
-//イメージタイプ
-#define IMGTYPE_FILE    0
-#define IMGTYPE_RES     1
-
-struct IMAGECTRLINFO{
-    int type;
-    char *path;
-};
-
-class CHILDINFO
-{
-public:
-    char *IdName;
+
+    bool IsFile() const
+    {
+        return ( type == ImageReferenceType::File );
+    }
+    bool IsResource() const
+    {
+        return ( type == ImageReferenceType::Resource );
+    }
+};
+
+class WindowInfoBase
+{
+public:
+    const std::string &GetName() const
+    {
+        return name;
+    }
+    void SetName( const std::string &name )
+    {
+        this->name = name;
+    }
+
+    const std::string &GetCaption() const
+    {
+        return caption;
+    }
+    void SetCaption( const std::string &caption )
+    {
+        this->caption = caption;
+    }
+
+    DWORD GetStyle() const
+    {
+        return style;
+    }
+    void SetStyle( DWORD style )
+    {
+        this->style = style;
+    }
+    void AddStyle( DWORD style )
+    {
+        this->style |= style;
+    }
+    void AndStyle( DWORD style )
+    {
+        this->style &= style;
+    }
+    void DeleteStyle( DWORD style )
+    {
+        this->style &= ~style;
+    }
+
+    DWORD GetExStyle() const
+    {
+        return exstyle;
+    }
+    void SetExStyle( DWORD exstyle )
+    {
+        this->exstyle = exstyle;
+    }
+    void AddExStyle( DWORD exstyle )
+    {
+        this->exstyle |= exstyle;
+    }
+
+private:
+    std::string name;
+    std::string caption;
+    DWORD style;
+    DWORD exstyle;
+
+public:
     POINT pos;
     SIZE size;
-    char *caption;
-    DWORD style;
-    DWORD ExStyle;
+};
+
+class ChildWindowInfo
+    : public WindowInfoBase
+{
+public:
     int Control;
 
-    IMAGECTRLINFO ImageCtrlInfo;
-};
+    ImageControlInfo image;
+};
+typedef std::vector<ChildWindowInfo *> ChildWindowInfos;
 class WindowInfo
+    : public WindowInfoBase
 {
 public:
     WindowInfo()
-        : caption( NULL )
-        , MenuID( NULL )
-        , IconResName( NULL )
-        , ClassName( NULL )
+        : WindowInfoBase()
         , CallBackName( NULL )
     {
     }
 
-    void SetName( const std::string &name )
-    {
-        this->name = name;
-    }
-    const std::string &GetName() const
-    {
-        return name;
-    }
-
+    const std::string &GetClassName() const
+    {
+        return className;
+    }
+    void SetClassName( const std::string &className )
+    {
+        this->className = className;
+    }
+
+    const std::string &GetHandleName() const
+    {
+        return handleName;
+    }
     void SetHandleName( const std::string &handleName )
     {
         this->handleName = handleName;
     }
-    const std::string &GetHandleName() const
-    {
-        return handleName;
+
+    const std::string &GetMenuIdName() const
+    {
+        return menuIdName;
+    }
+    void SetMenuIdName( const std::string &menuIdName )
+    {
+        this->menuIdName = menuIdName;
+    }
+    bool HasMenu() const
+    {
+        return !menuIdName.empty();
+    }
+
+    int GetBackgroundColor() const
+    {
+        return backgroundColor;
+    }
+    void SetBackgroundColor( int backgroundColor )
+    {
+        this->backgroundColor = backgroundColor;
+    }
+
+    const std::string &GetIconResourceName() const
+    {
+        return iconResourceName;
+    }
+    void SetIconResourceName( const std::string &iconResourceName )
+    {
+        this->iconResourceName = iconResourceName;
+    }
+    bool HasIcon() const
+    {
+        return !iconResourceName.empty();
     }
 
     //ウィンドウデータ
-    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;
@@ -93 +175 @@
 
     //子ウィンドウ管理
-    std::vector<CHILDINFO *> childWindowInfos;
+    ChildWindowInfos childWindowInfos;
 
     //ツリー項目
@@ -99 +181 @@
 
 private:
-    std::string name;
+    std::string className;
     std::string handleName;
+    std::string menuIdName;
+    int backgroundColor;
+    std::string iconResourceName;
 };
 
@@ -133 +218 @@
     }
 };
+
+
+}}

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

@@ -632 +632 @@
     }
     else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
         int indexOfWndInfo = GetWndInfoNum(MdiInfo[WndNum].path);
 
@@ -811 +811 @@
     }
     else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-        WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
-        for(int i3=0;i3<pWindowInfo->childWindowInfos.size();i3++){
-            MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]=i3;
+        ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+        for( int i3=0; i3<static_cast<int>(pWindowInfo->childWindowInfos.size()); i3++ )
+        {
+            MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3] = i3;
         }
         DrawRadWindow(WndNum,pWindowInfo);

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

@@ -1 +1 @@
 #include "stdafx.h"
 
-using namespace ActiveBasic::IDE;
+using namespace ActiveBasic::PM;
 
 void OpenWorkfile( const std::string &path );
@@ -293 +293 @@
         if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
             if(MdiInfo[WndNum].MdiIconEditInfo->bModify){
-                for(i=0;i<this->resourceManager.iconResources.size();i++){
-                    lstrcpy(temporary,this->resourceManager.iconResources[i].filepath.c_str());
+                BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.iconResources )
+                {
+                    lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
                     if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
@@ -357 +358 @@
         i2=0;
         i3=101;
-        for(i=0;i<this->resourceManager.cursorResources.size();i++,i3++){
+        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.cursorResources )
+        {
             sprintf(buffer+i2,"Const %s=%d\r\n",
-                this->resourceManager.cursorResources[i].idName.c_str(),
+                resourceItem.idName.c_str(),
                 i3);
             i2+=lstrlen(buffer+i2);
-        }
-        for(i=0;i<this->resourceManager.bitmapResources.size();i++,i3++){
+
+            i3++;
+        }
+        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.bitmapResources )
+        {
             sprintf(buffer+i2,"Const %s=%d\r\n",
-                this->resourceManager.bitmapResources[i].idName.c_str(),
+                resourceItem.idName.c_str(),
                 i3);
             i2+=lstrlen(buffer+i2);
-        }
-        for(i=0;i<this->resourceManager.iconResources.size();i++,i3++){
+
+            i3++;
+        }
+        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.iconResources )
+        {
             sprintf(buffer+i2,"Const %s=%d\r\n",
-                this->resourceManager.iconResources[i].idName.c_str(),
+                resourceItem.idName.c_str(),
                 i3);
             i2+=lstrlen(buffer+i2);
+
+            i3++;
         }
 
@@ -380 +390 @@
 
         i2=0;
-        for(i=0;i<this->resourceManager.cursorResources.size();i++){
+        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.cursorResources )
+        {
             sprintf(buffer+i2,"%s CURSOR \"%s\"\r\n",
-                this->resourceManager.cursorResources[i].idName.c_str(),
-                this->resourceManager.cursorResources[i].filepath.c_str());
-            i2+=lstrlen(buffer+i2);
-        }
-        for(i=0;i<this->resourceManager.bitmapResources.size();i++){
+                resourceItem.idName.c_str(),
+                resourceItem.filepath.c_str());
+            i2+=lstrlen(buffer+i2);
+        }
+        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.bitmapResources )
+        {
             sprintf(buffer+i2,"%s BITMAP \"%s\"\r\n",
-                this->resourceManager.bitmapResources[i].idName.c_str(),
-                this->resourceManager.bitmapResources[i].filepath.c_str());
-            i2+=lstrlen(buffer+i2);
-        }
-        for(i=0;i<this->resourceManager.iconResources.size();i++){
+                resourceItem.idName.c_str(),
+                resourceItem.filepath.c_str());
+            i2+=lstrlen(buffer+i2);
+        }
+        BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, resourceManager.iconResources )
+        {
             sprintf(buffer+i2,"%s ICON \"%s\"\r\n",
-                this->resourceManager.iconResources[i].idName.c_str(),
-                this->resourceManager.iconResources[i].filepath.c_str());
+                resourceItem.idName.c_str(),
+                resourceItem.filepath.c_str());
             i2+=lstrlen(buffer+i2);
         }
@@ -521 +534 @@
     extern HANDLE hHeap;
     extern MDIINFO MdiInfo[MAX_WNDNUM];
-    int i,i2,WndNum;
+    int i,WndNum;
     HWND hChild,hCloseChild;
     char temporary[MAX_PATH];
@@ -587 +600 @@
 
     //ウィンドウ情報のメモリを解放
-    BOOST_FOREACH( WindowInfo *pWindowInfo, windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, windowInfos )
     {
-        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<pWindowInfo->childWindowInfos.size();i2++){
-            HeapDefaultFree(pWindowInfo->childWindowInfos[i2]->IdName);
-            HeapDefaultFree(pWindowInfo->childWindowInfos[i2]->caption);
-            if(pWindowInfo->childWindowInfos[i2]->Control==CT_IMAGEBOX){
-                //イメージ ボックスの場合
-                HeapDefaultFree(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path);
-            }
-
-            delete pWindowInfo->childWindowInfos[i2];
+        BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildWindowInfo, pWindowInfo->childWindowInfos )
+        {
+            delete pChildWindowInfo;
         }
         pWindowInfo->childWindowInfos.clear();