Changeset 624 in dev for trunk/ab5.0
- Timestamp:
- May 23, 2008, 10:35:36 PM (17 years ago)
- Location:
- trunk/ab5.0
- Files:
-
- 1 added
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/BasicCompiler_Common/RSrcSection.cpp
r622 r624 96 96 97 97 //カーソルの枚数を計算(CursorNumに格納) 98 for(i3=0;i3<compiler.resourceManager.cursorResources.size();i3++){ 99 hFile=CreateFile(compiler.resourceManager.cursorResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 98 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.cursorResources ) 99 { 100 hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 100 101 if(hFile==INVALID_HANDLE_VALUE){ 101 compiler.errorMessenger.Output(23, compiler.resourceManager.cursorResources[i3].filepath.c_str(),-1);102 compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1); 102 103 sw=1; 103 104 continue; … … 115 116 116 117 //ビットマップのファイルの有無を確認 117 for(i3=0;i3<compiler.resourceManager.bitmapResources.size();i3++){ 118 hFile=CreateFile(compiler.resourceManager.bitmapResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 118 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.bitmapResources ) 119 { 120 hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 119 121 if(hFile==INVALID_HANDLE_VALUE){ 120 compiler.errorMessenger.Output(23, compiler.resourceManager.bitmapResources[i3].filepath.c_str(),-1);122 compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1); 121 123 sw=1; 122 124 continue; … … 126 128 127 129 //アイコンの枚数を計算(IconNumに格納) 128 for(i3=0;i3<compiler.resourceManager.iconResources.size();i3++){ 129 hFile=CreateFile(compiler.resourceManager.iconResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 130 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, compiler.resourceManager.iconResources ) 131 { 132 hFile=CreateFile(resourceItem.filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 130 133 if(hFile==INVALID_HANDLE_VALUE){ 131 compiler.errorMessenger.Output(23, compiler.resourceManager.iconResources[i3].filepath.c_str(),-1);134 compiler.errorMessenger.Output(23,resourceItem.filepath.c_str(),-1); 132 135 sw=1; 133 136 continue; … … 284 287 i2+=sizeof(IMAGE_RESOURCE_DIRECTORY); 285 288 286 for(i3=0;i3< compiler.resourceManager.bitmapResources.size();i3++)289 for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++) 287 290 { 288 ImgDirEntry.Name = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(291 ImgDirEntry.Name = static_cast<DWORD>(compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData( 289 292 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( 290 293 compiler.resourceManager.bitmapResources[i3].idName 291 294 ) 292 ) ;295 )); 293 296 ImgDirEntry.OffsetToData=(NextBase+i6+ 294 297 (sizeof(IMAGE_RESOURCE_DIRECTORY)+ … … 339 342 i2+=sizeof(IMAGE_RESOURCE_DIRECTORY); 340 343 341 for(i3=0;i3< compiler.resourceManager.cursorResources.size();i3++){342 ImgDirEntry.Name = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(344 for(i3=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){ 345 ImgDirEntry.Name = static_cast<DWORD>(compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData( 343 346 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( 344 347 compiler.resourceManager.cursorResources[i3].idName 345 348 ) 346 ) ;349 )); 347 350 ImgDirEntry.OffsetToData=(NextBase+i6+ 348 351 (sizeof(IMAGE_RESOURCE_DIRECTORY)+ … … 369 372 i2+=sizeof(IMAGE_RESOURCE_DIRECTORY); 370 373 371 for(i3=0;i3< compiler.resourceManager.iconResources.size();i3++){372 ImgDirEntry.Name = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(374 for(i3=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){ 375 ImgDirEntry.Name = static_cast<DWORD>(compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData( 373 376 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( 374 377 compiler.resourceManager.iconResources[i3].idName 375 378 ) 376 ) ;379 )); 377 380 ImgDirEntry.OffsetToData=(NextBase+i6+ 378 381 (sizeof(IMAGE_RESOURCE_DIRECTORY)+ … … 447 450 if( !compiler.resourceManager.bitmapResources.empty() ){ 448 451 //RT_BITMAP 449 for(i3=0;i3< compiler.resourceManager.bitmapResources.size();i3++){452 for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++){ 450 453 ImgResDir.Characteristics=0; 451 454 ImgResDir.TimeDateStamp=0; … … 490 493 { 491 494 //RT_GROUP_CURSOR 492 for(i3=0;i3< compiler.resourceManager.cursorResources.size();i3++){495 for(i3=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){ 493 496 ImgResDir.Characteristics=0; 494 497 ImgResDir.TimeDateStamp=0; … … 512 515 { 513 516 //RT_GROUP_ICON 514 for(i3=0;i3< compiler.resourceManager.iconResources.size();i3++){517 for(i3=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){ 515 518 ImgResDir.Characteristics=0; 516 519 ImgResDir.TimeDateStamp=0; … … 590 593 //RT_BITMAP 591 594 BitmapEntryBase=DataEntryScheduleNum; 592 for(i3=0;i3< compiler.resourceManager.bitmapResources.size();i3++){595 for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++){ 593 596 dwDataEntrySchedule[DataEntryScheduleNum]=i2; 594 597 DataEntryScheduleNum++; … … 608 611 //RT_GROUP_CURSOR 609 612 CursorGroupEntryBase=DataEntryScheduleNum; 610 for(i3=0;i3< compiler.resourceManager.cursorResources.size();i3++){613 for(i3=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){ 611 614 dwDataEntrySchedule[DataEntryScheduleNum]=i2; 612 615 DataEntryScheduleNum++; … … 617 620 //RT_GROUP_ICON 618 621 IconGroupEntryBase=DataEntryScheduleNum; 619 for(i3=0;i3< compiler.resourceManager.iconResources.size();i3++){622 for(i3=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){ 620 623 dwDataEntrySchedule[DataEntryScheduleNum]=i2; 621 624 DataEntryScheduleNum++; … … 657 660 658 661 //カーソルリソース 659 for(i3=0,i6=0;i3< compiler.resourceManager.cursorResources.size();i3++){662 for(i3=0,i6=0;i3<static_cast<int>(compiler.resourceManager.cursorResources.size());i3++){ 660 663 hFile=CreateFile(compiler.resourceManager.cursorResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 661 664 if(hFile==INVALID_HANDLE_VALUE){ … … 737 740 738 741 //ビットマップリソース 739 for(i3=0;i3< compiler.resourceManager.bitmapResources.size();i3++){742 for(i3=0;i3<static_cast<int>(compiler.resourceManager.bitmapResources.size());i3++){ 740 743 hFile=CreateFile(compiler.resourceManager.bitmapResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 741 744 if(hFile==INVALID_HANDLE_VALUE){ … … 765 768 766 769 //アイコンリソース 767 for(i3=0,i6=0;i3< compiler.resourceManager.iconResources.size();i3++){770 for(i3=0,i6=0;i3<static_cast<int>(compiler.resourceManager.iconResources.size());i3++){ 768 771 hFile=CreateFile(compiler.resourceManager.iconResources[i3].filepath.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 769 772 if(hFile==INVALID_HANDLE_VALUE){ -
trunk/ab5.0/abdev/abdev/Common.h
r623 r624 970 970 //WindowControl.cpp 971 971 int GetWndInfoNum(char *name); 972 WindowInfo *GetWndInfo( char *name );972 ActiveBasic::PM::WindowInfo *GetWndInfo( char *name ); 973 973 HGLOBAL Rad_GetChildInfoClipboardData(int WndNum,int WndInfoNum); 974 974 void Rad_PasteChildInfoClipboardData(int WndNum,HGLOBAL hGlobal); … … 976 976 void GetItemClassName(char *buffer,int Control); 977 977 void SaveWindowProgram(); 978 void SaveWindowFile( char *path, const WindowInfos &windowInfos );978 void SaveWindowFile( char *path, const ActiveBasic::PM::WindowInfos &windowInfos ); 979 979 _int8 OpenWindowFile(char *path); 980 980 void GetDefaultWindowFont(LOGFONT *LogFont); … … 1000 1000 1001 1001 //RadProc.cpp 1002 void NewRadWindow( const WindowInfo &windowInfo );1003 int InsertDlgItem(int WndNum,int WndInfoNum,int ItemNum,POINT *pPos,SIZE *pSize,c har *IdName,char *caption,DWORD style_or_WndNum,DWORD ExStyle,int Control,int ImageType,char *ImagePath,DWORD dwInsertType);1002 void NewRadWindow( const ActiveBasic::PM::WindowInfo &windowInfo ); 1003 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); 1004 1004 void DeleteDlgItem(int WndNum,int WndInfoNum,int ItemNum,BOOL bNoticeChanging); 1005 1005 void CursorPos_GlobalToLocal(HWND hwnd,long *x,long *y); … … 1012 1012 1013 1013 //DrawWindow.cpp 1014 void DrawRadWindow(int WndNum,const WindowInfo *pWindowInfo);1014 void DrawRadWindow(int WndNum,const ActiveBasic::PM::WindowInfo *pWindowInfo); 1015 1015 1016 1016 //Rad_UndoRedo.cpp … … 1048 1048 //RadSupport.cpp 1049 1049 LRESULT CALLBACK TestWindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam); 1050 void SetSupportDlgData(int WndNum, const WindowInfo &windowInfo );1050 void SetSupportDlgData(int WndNum, const ActiveBasic::PM::WindowInfo &windowInfo ); 1051 1051 BOOL CALLBACK DlgRadSupport(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam); 1052 1052 … … 1057 1057 1058 1058 //MenuProc.cpp 1059 int GetMenuInfoNum(c har *name);1059 int GetMenuInfoNum(const char *name); 1060 1060 void HeapMenuDataFree(MENU_INFO *pMenuInfo,int ItemNum,int *NumberOfFreedItem); 1061 1061 BOOL CALLBACK DlgProject_MenuID_Input(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam); -
trunk/ab5.0/abdev/abdev/DrawWindow.cpp
r623 r624 687 687 DeleteObject(hBmp); 688 688 } 689 void DesigningWindow(int WndNum,HDC hdc,POINT *pBasePos,const WindowInfo *pWindowInfo){689 void DesigningWindow(int WndNum,HDC hdc,POINT *pBasePos,const ActiveBasic::PM::WindowInfo *pWindowInfo){ 690 690 extern MDIINFO MdiInfo[MAX_WNDNUM]; 691 691 int i,i2,i3,i4; … … 713 713 InsideRect.bottom=InsideRect.top+pWindowInfo->size.cy; 714 714 715 if(pWindowInfo-> style&(WS_BORDER|WS_THICKFRAME)){715 if(pWindowInfo->GetStyle()&(WS_BORDER|WS_THICKFRAME)){ 716 716 DrawEdge(hdc,&InsideRect,EDGE_RAISED,BF_RECT); 717 717 … … 725 725 //////////// 726 726 //枠を描画 727 if(pWindowInfo-> style&(WS_BORDER|WS_THICKFRAME)){727 if(pWindowInfo->GetStyle()&(WS_BORDER|WS_THICKFRAME)){ 728 728 //細枠 729 729 hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_ACTIVEBORDER)); … … 739 739 740 740 //サイズ変更枠 741 if(pWindowInfo-> style&WS_THICKFRAME){741 if(pWindowInfo->GetStyle()&WS_THICKFRAME){ 742 742 Rectangle(hdc,InsideRect.left,InsideRect.top,InsideRect.right,InsideRect.bottom); 743 743 … … 758 758 MdiInfo[WndNum].MdiRadInfo->ClientPos.y=0; 759 759 760 if(pWindowInfo-> style&(WS_CAPTION&(~WS_BORDER))){760 if(pWindowInfo->GetStyle()&(WS_CAPTION&(~WS_BORDER))){ 761 761 ////////////////////// 762 762 //タイトルバーを描画 … … 773 773 } 774 774 else i2=i; 775 if(pWindowInfo-> ExStyle&WS_EX_TOOLWINDOW)775 if(pWindowInfo->GetExStyle()&WS_EX_TOOLWINDOW) 776 776 i3=GetSystemMetrics(SM_CYSMCAPTION); 777 777 else i3=GetSystemMetrics(SM_CYCAPTION); … … 805 805 rect.right=InsideRect.right; 806 806 rect.bottom=InsideRect.top+i3; 807 DrawText(hdc,pWindowInfo-> caption,lstrlen(pWindowInfo->caption),&rect,DT_SINGLELINE|DT_VCENTER|DT_NOPREFIX);807 DrawText(hdc,pWindowInfo->GetCaption().c_str(),pWindowInfo->GetCaption().size(),&rect,DT_SINGLELINE|DT_VCENTER|DT_NOPREFIX); 808 808 SelectObject(hdc,hOldFont); 809 809 DeleteObject(hFont); 810 810 811 811 //ボタン 812 if(pWindowInfo-> style&WS_SYSMENU){812 if(pWindowInfo->GetStyle()&WS_SYSMENU){ 813 813 //終了ボタン 814 814 size.cx=GetSystemMetrics(SM_CXSIZE)-2; … … 857 857 GlobalFree(pByte2); 858 858 859 if(pWindowInfo-> style&WS_MAXIMIZEBOX||pWindowInfo->style&WS_MINIMIZEBOX){859 if(pWindowInfo->GetStyle()&WS_MAXIMIZEBOX||pWindowInfo->GetStyle()&WS_MINIMIZEBOX){ 860 860 //最大化ボタン 861 861 size.cx=GetSystemMetrics(SM_CXSIZE)-2; … … 864 864 pos.y=InsideRect.top+2; 865 865 DrawButtonEdge(WndNum,&pos,&size); 866 if(!(pWindowInfo-> style&WS_MAXIMIZEBOX)){866 if(!(pWindowInfo->GetStyle()&WS_MAXIMIZEBOX)){ 867 867 pos.x++; 868 868 pos.y++; … … 897 897 pos.y=InsideRect.top+2; 898 898 DrawButtonEdge(WndNum,&pos,&size); 899 if(!(pWindowInfo-> style&WS_MINIMIZEBOX)){899 if(!(pWindowInfo->GetStyle()&WS_MINIMIZEBOX)){ 900 900 pos.x++; 901 901 pos.y++; … … 927 927 } 928 928 929 if(pWindowInfo->MenuID){ 929 if( pWindowInfo->HasMenu() ) 930 { 930 931 //メニューラインを3DFACEで描画 931 932 rgb=GetSysColor(COLOR_3DFACE); … … 954 955 size.cx=InsideRect.right-InsideRect.left; 955 956 size.cy=InsideRect.bottom-InsideRect.top; 956 DrawItemEdgeByExStyle(WndNum,pWindowInfo-> ExStyle,&pos,&size);957 DrawItemEdgeByExStyle(WndNum,pWindowInfo->GetExStyle(),&pos,&size); 957 958 958 959 //スクロールバーを描画 959 DrawWindowScrollBar(WndNum,pWindowInfo-> style,&pos,&size);960 DrawWindowScrollBar(WndNum,pWindowInfo->GetStyle(),&pos,&size); 960 961 961 962 //クライアント領域のサイズを設定 … … 965 966 ////////////// 966 967 //背景を描画 967 if(pWindowInfo-> bgColor==COLOR_3DFACE){968 if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE){ 968 969 //3DFACE 969 970 hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DFACE)); … … 977 978 DeleteObject(hBrush); 978 979 } 979 else if(pWindowInfo-> bgColor<=0){980 else if(pWindowInfo->GetBackgroundColor()<=0){ 980 981 //色指定 981 hPen=CreatePen(PS_SOLID,0,-pWindowInfo-> bgColor);982 hBrush=CreateSolidBrush(-pWindowInfo-> bgColor);982 hPen=CreatePen(PS_SOLID,0,-pWindowInfo->GetBackgroundColor()); 983 hBrush=CreateSolidBrush(-pWindowInfo->GetBackgroundColor()); 983 984 hOldPen=(HPEN)SelectObject(hdc,hPen); 984 985 hOldBrush=(HBRUSH)SelectObject(hdc,hBrush); … … 989 990 DeleteObject(hBrush); 990 991 } 991 else if(pWindowInfo-> bgColor>=0x1000){992 else if(pWindowInfo->GetBackgroundColor()>=0x1000){ 992 993 //ビットマップ 993 for(i2=0;i2<projectInfo.resourceManager.bitmapResources.size();i2++){ 994 if( projectInfo.resourceManager.bitmapResources[pWindowInfo->bgColor-0x1000].idName == projectInfo.resourceManager.bitmapResources[i2].idName ) 994 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 995 { 996 if( projectInfo.resourceManager.bitmapResources[pWindowInfo->GetBackgroundColor()-0x1000].idName == resourceItem.idName ) 995 997 { 998 lstrcpy(temporary,resourceItem.filepath.c_str()); 999 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); 1000 hImage=LoadImage(NULL,temporary,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE); 1001 1002 hBrush=CreatePatternBrush((HBITMAP)hImage); 1003 hOldBrush=(HBRUSH)SelectObject(hdc,hBrush); 1004 SetBrushOrgEx(hdc,InsideRect.left,InsideRect.top,&pos); 1005 PatBlt(hdc, 1006 InsideRect.left, InsideRect.top, 1007 InsideRect.right-InsideRect.left, InsideRect.bottom-InsideRect.top,PATCOPY); 1008 SetBrushOrgEx(hdc,pos.x,pos.y,0); 1009 SelectObject(hdc,hOldBrush); 1010 DeleteObject(hBrush); 1011 DeleteObject(hImage); 1012 996 1013 break; 997 1014 } 998 }999 if(i2!=projectInfo.resourceManager.bitmapResources.size()){1000 lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i2].filepath.c_str());1001 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );1002 hImage=LoadImage(NULL,temporary,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE|LR_LOADFROMFILE);1003 1004 hBrush=CreatePatternBrush((HBITMAP)hImage);1005 hOldBrush=(HBRUSH)SelectObject(hdc,hBrush);1006 SetBrushOrgEx(hdc,InsideRect.left,InsideRect.top,&pos);1007 PatBlt(hdc,1008 InsideRect.left, InsideRect.top,1009 InsideRect.right-InsideRect.left, InsideRect.bottom-InsideRect.top,PATCOPY);1010 SetBrushOrgEx(hdc,pos.x,pos.y,0);1011 SelectObject(hdc,hOldBrush);1012 DeleteObject(hBrush);1013 DeleteObject(hImage);1014 1015 } 1015 1016 } … … 1019 1020 //子ウィンドウ(ダイアログアイテム)を描画 1020 1021 hFont=CreateFontIndirect(&pWindowInfo->LogFont); 1021 BOOST_FOREACH( CHILDINFO*pChildInfo, pWindowInfo->childWindowInfos )1022 BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos ) 1022 1023 { 1023 1024 pos=pChildInfo->pos; … … 1025 1026 1026 1027 //ExStyleによる縁を描画 1027 DrawItemEdgeByExStyle(WndNum,pChildInfo-> ExStyle,&pos,&size);1028 DrawItemEdgeByExStyle(WndNum,pChildInfo->GetExStyle(),&pos,&size); 1028 1029 1029 1030 if(pChildInfo->Control==CT_BUTTON){ … … 1031 1032 // Button コントロール 1032 1033 1033 if((pChildInfo-> style&0x0000000F)==BS_DEFPUSHBUTTON){1034 if((pChildInfo->GetStyle()&0x0000000F)==BS_DEFPUSHBUTTON){ 1034 1035 //標準のボタンの場合(黒枠描画) 1035 1036 DrawRectangleInClient(WndNum, … … 1046 1047 DrawButtonEdge(WndNum,&pos,&size); 1047 1048 1048 if(!(pChildInfo-> style&(BS_ICON|BS_BITMAP))){1049 if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){ 1049 1050 //キャプション テキスト 1050 1051 … … 1054 1055 rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y; 1055 1056 1056 if(pChildInfo-> style&BS_MULTILINE) i4=0;1057 if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0; 1057 1058 else i4=DT_SINGLELINE; 1058 1059 1059 1060 //ビットを考慮してBS_CENTERを最初に比較する 1060 if((pChildInfo-> style&BS_CENTER)==BS_CENTER) i2=DT_CENTER;1061 else if(pChildInfo-> style&BS_LEFT) i2=DT_LEFT;1062 else if(pChildInfo-> style&BS_RIGHT) i2=DT_RIGHT;1061 if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER) i2=DT_CENTER; 1062 else if(pChildInfo->GetStyle()&BS_LEFT) i2=DT_LEFT; 1063 else if(pChildInfo->GetStyle()&BS_RIGHT) i2=DT_RIGHT; 1063 1064 else i2=DT_CENTER; 1064 1065 1065 1066 //ビットを考慮してBS_VCENTERを最初に比較する 1066 if((pChildInfo-> style&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;1067 else if(pChildInfo-> style&BS_TOP) i3=DT_TOP;1068 else if(pChildInfo-> style&BS_BOTTOM) i3=DT_BOTTOM;1067 if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER; 1068 else if(pChildInfo->GetStyle()&BS_TOP) i3=DT_TOP; 1069 else if(pChildInfo->GetStyle()&BS_BOTTOM) i3=DT_BOTTOM; 1069 1070 else i3=DT_VCENTER; 1070 1071 1071 1072 hOldFont=(HFONT)SelectObject(hdc,hFont); 1072 if(pChildInfo-> style&WS_DISABLED){1073 if(pChildInfo->GetStyle()&WS_DISABLED){ 1073 1074 SetTextColor(hdc,RGB(255,255,255)); 1074 1075 rc2.left=rect.left+1; … … 1076 1077 rc2.right=rect.right+1; 1077 1078 rc2.bottom=rect.bottom+1; 1078 DrawText(hdc,pChildInfo-> caption,-1,&rc2,i4|i2|i3);1079 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i4|i2|i3); 1079 1080 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT)); 1080 1081 } 1081 1082 else SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT)); 1082 1083 1083 DrawText(hdc,pChildInfo-> caption,-1,&rect,i4|i2|i3);1084 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2|i3); 1084 1085 SelectObject(hdc,hOldFont); 1085 1086 } … … 1089 1090 // CheckBox コントロール 1090 1091 1091 if(pChildInfo-> style&BS_PUSHLIKE){1092 if(pChildInfo->GetStyle()&BS_PUSHLIKE){ 1092 1093 //ボタンの縁を描画 1093 1094 DrawButtonEdge(WndNum,&pos,&size); … … 1097 1098 size2.cx=13; 1098 1099 size2.cy=13; 1099 if(pChildInfo-> style&BS_LEFTTEXT)1100 if(pChildInfo->GetStyle()&BS_LEFTTEXT) 1100 1101 pos2.x=pos.x+size.cx-size2.cx; 1101 1102 else pos2.x=pos.x; 1102 if((pChildInfo-> style&BS_VCENTER)==BS_VCENTER||1103 (pChildInfo-> style&BS_VCENTER)==0)1103 if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER|| 1104 (pChildInfo->GetStyle()&BS_VCENTER)==0) 1104 1105 pos2.y=pos.y+(size.cy/2)-(size2.cy/2); 1105 else if(pChildInfo-> style&BS_TOP)1106 else if(pChildInfo->GetStyle()&BS_TOP) 1106 1107 pos2.y=pos.y+1; 1107 else if(pChildInfo-> style&BS_BOTTOM)1108 else if(pChildInfo->GetStyle()&BS_BOTTOM) 1108 1109 pos2.y=pos.y+size.cy-size2.cy-1; 1109 1110 DrawItemEdgeByExStyle(WndNum,WS_EX_CLIENTEDGE,&pos2,&size2); 1110 1111 1111 if(pChildInfo-> style&WS_DISABLED)1112 if(pChildInfo->GetStyle()&WS_DISABLED) 1112 1113 rgb=GetSysColor(COLOR_3DFACE); 1113 1114 else rgb=GetSysColor(COLOR_WINDOW); … … 1115 1116 pos2.x+size2.cx, pos2.y+size2.cy, 1116 1117 rgb,rgb,1); 1117 if(!(pChildInfo-> style&BS_LEFTTEXT)) pos.x+=17;1118 if(!(pChildInfo->GetStyle()&BS_LEFTTEXT)) pos.x+=17; 1118 1119 else pos.x++; 1119 1120 size.cx-=17; 1120 1121 } 1121 1122 1122 if(!(pChildInfo-> style&(BS_ICON|BS_BITMAP))){1123 if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){ 1123 1124 //キャプション テキスト 1124 1125 rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x; … … 1127 1128 rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y; 1128 1129 1129 if(pChildInfo-> style&BS_MULTILINE) i4=0;1130 if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0; 1130 1131 else i4=DT_SINGLELINE; 1131 1132 1132 1133 //ビットを考慮してBS_CENTERを最初に比較する 1133 if((pChildInfo-> style&BS_CENTER)==BS_CENTER) i2=DT_CENTER;1134 else if(pChildInfo-> style&BS_LEFT) i2=DT_LEFT;1135 else if(pChildInfo-> style&BS_RIGHT) i2=DT_RIGHT;1134 if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER) i2=DT_CENTER; 1135 else if(pChildInfo->GetStyle()&BS_LEFT) i2=DT_LEFT; 1136 else if(pChildInfo->GetStyle()&BS_RIGHT) i2=DT_RIGHT; 1136 1137 else i2=DT_LEFT; 1137 1138 1138 1139 //ビットを考慮してBS_VCENTERを最初に比較する 1139 if((pChildInfo-> style&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;1140 else if(pChildInfo-> style&BS_TOP) i3=DT_TOP;1141 else if(pChildInfo-> style&BS_BOTTOM) i3=DT_BOTTOM;1140 if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER; 1141 else if(pChildInfo->GetStyle()&BS_TOP) i3=DT_TOP; 1142 else if(pChildInfo->GetStyle()&BS_BOTTOM) i3=DT_BOTTOM; 1142 1143 else i3=DT_VCENTER; 1143 1144 1144 1145 hOldFont=(HFONT)SelectObject(hdc,hFont); 1145 if(pChildInfo-> style&WS_DISABLED){1146 if(pChildInfo->GetStyle()&WS_DISABLED){ 1146 1147 SetTextColor(hdc,RGB(255,255,255)); 1147 1148 rc2.left=rect.left+1; … … 1149 1150 rc2.right=rect.right+1; 1150 1151 rc2.bottom=rect.bottom+1; 1151 DrawText(hdc,pChildInfo-> caption,-1,&rc2,i4|i2|i3);1152 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i4|i2|i3); 1152 1153 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT)); 1153 1154 } 1154 1155 else SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT)); 1155 1156 1156 DrawText(hdc,pChildInfo-> caption,-1,&rect,i4|i2|i3);1157 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2|i3); 1157 1158 SelectObject(hdc,hOldFont); 1158 1159 } … … 1168 1169 1169 1170 //内部 1170 if(pChildInfo-> style&WS_DISABLED)1171 if(pChildInfo->GetStyle()&WS_DISABLED) 1171 1172 rgb=GetSysColor(COLOR_3DFACE); 1172 1173 else rgb=GetSysColor(COLOR_WINDOW); … … 1176 1177 rgb,rgb,1); 1177 1178 1178 if((pChildInfo-> style&0x000F)==CBS_SIMPLE){1179 if((pChildInfo->GetStyle()&0x000F)==CBS_SIMPLE){ 1179 1180 pos.y+=20; 1180 1181 size.cy-=20; … … 1202 1203 1203 1204 pos2.x--; 1204 if(pChildInfo-> style&WS_DISABLED){1205 if(pChildInfo->GetStyle()&WS_DISABLED){ 1205 1206 hPen=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DHIGHLIGHT)); 1206 1207 hOldPen=(HPEN)SelectObject(hdc,hPen); … … 1233 1234 1234 1235 //内部 1235 if(pChildInfo-> style&WS_DISABLED||pChildInfo->style&ES_READONLY)1236 if(pChildInfo->GetStyle()&WS_DISABLED||pChildInfo->GetStyle()&ES_READONLY) 1236 1237 rgb=GetSysColor(COLOR_3DFACE); 1237 1238 else rgb=GetSysColor(COLOR_WINDOW); … … 1247 1248 rect.bottom=pos.y+size.cy-1+MdiInfo[WndNum].MdiRadInfo->ClientPos.y; 1248 1249 1249 if(pChildInfo-> style&ES_MULTILINE) i4=0;1250 if(pChildInfo->GetStyle()&ES_MULTILINE) i4=0; 1250 1251 else i4=DT_SINGLELINE; 1251 1252 1252 1253 //ビットを考慮してES_LEFTを最後に検討する 1253 if(pChildInfo-> style&ES_CENTER) i2=DT_CENTER;1254 else if(pChildInfo-> style&ES_RIGHT) i2=DT_RIGHT;1254 if(pChildInfo->GetStyle()&ES_CENTER) i2=DT_CENTER; 1255 else if(pChildInfo->GetStyle()&ES_RIGHT) i2=DT_RIGHT; 1255 1256 else i2=DT_LEFT; 1256 1257 1257 1258 //文字色を設定 1258 if(pChildInfo-> style&WS_DISABLED)1259 if(pChildInfo->GetStyle()&WS_DISABLED) 1259 1260 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT)); 1260 1261 else … … 1262 1263 1263 1264 hOldFont=(HFONT)SelectObject(hdc,hFont); 1264 DrawText(hdc,pChildInfo-> caption,-1,&rect,i4|i2);1265 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2); 1265 1266 SelectObject(hdc,hOldFont); 1266 1267 } … … 1271 1272 1272 1273 hOldFont=(HFONT)SelectObject(hdc,hFont); 1273 GetTextExtentPoint32(hdc,pChildInfo-> caption,lstrlen(pChildInfo->caption),&size2);1274 GetTextExtentPoint32(hdc,pChildInfo->GetCaption().c_str(),pChildInfo->GetCaption().size(),&size2); 1274 1275 1275 1276 //枠を描画 … … 1281 1282 1282 1283 //ビットを考慮してBS_CENTERを最初に検討する 1283 if((pChildInfo-> style&BS_CENTER)==BS_CENTER){1284 if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER){ 1284 1285 rect.left=pos.x+(size.cx/2)-(size2.cx/2)-3; 1285 1286 rect.right=rect.left+size2.cx+4; 1286 1287 } 1287 else if(pChildInfo-> style&BS_RIGHT){1288 else if(pChildInfo->GetStyle()&BS_RIGHT){ 1288 1289 rect.right=pos.x+size.cx-7; 1289 1290 rect.left=rect.right-size2.cx-4; … … 1296 1297 rect.bottom=pos.y+size2.cy; 1297 1298 1298 if(pWindowInfo-> bgColor==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE);1299 else rgb=-pWindowInfo-> bgColor;1299 if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE); 1300 else rgb=-pWindowInfo->GetBackgroundColor(); 1300 1301 DrawRectangleInClient(WndNum,rect.left,rect.top,rect.right,rect.bottom,rgb,rgb,1); 1301 1302 1302 if(!((pChildInfo-> style&BS_ICON)||(pChildInfo->style&BS_BITMAP))){1303 if(!((pChildInfo->GetStyle()&BS_ICON)||(pChildInfo->GetStyle()&BS_BITMAP))){ 1303 1304 rect.left+=MdiInfo[WndNum].MdiRadInfo->ClientPos.x; 1304 1305 rect.top+=MdiInfo[WndNum].MdiRadInfo->ClientPos.y; … … 1309 1310 1310 1311 //テキストを描画 1311 if(pChildInfo-> style&WS_DISABLED){1312 if(pChildInfo->GetStyle()&WS_DISABLED){ 1312 1313 SetTextColor(hdc,RGB(255,255,255)); 1313 1314 rc2.left=rect.left+1; … … 1315 1316 rc2.right=rect.right+1; 1316 1317 rc2.bottom=rect.bottom+1; 1317 DrawText(hdc,pChildInfo-> caption,-1,&rc2,DT_SINGLELINE);1318 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,DT_SINGLELINE); 1318 1319 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT)); 1319 1320 } … … 1321 1322 SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT)); 1322 1323 1323 DrawText(hdc,pChildInfo-> caption,-1,&rect,DT_SINGLELINE);1324 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,DT_SINGLELINE); 1324 1325 } 1325 1326 SelectObject(hdc,hOldFont); … … 1329 1330 //////////////////////////////////// 1330 1331 // 水平スクロールバー コントロール 1331 DrawScrollBar(WndNum,pChildInfo-> style,0,&pos,&size);1332 DrawScrollBar(WndNum,pChildInfo->GetStyle(),0,&pos,&size); 1332 1333 } 1333 1334 … … 1337 1338 HDC memdc; 1338 1339 1339 if((pChildInfo-> style&0x0000000F)==SS_BLACKFRAME)1340 if((pChildInfo->GetStyle()&0x0000000F)==SS_BLACKFRAME) 1340 1341 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(0,0,0),0,0); 1341 else if((pChildInfo-> style&0x0000000F)==SS_GRAYFRAME)1342 else if((pChildInfo->GetStyle()&0x0000000F)==SS_GRAYFRAME) 1342 1343 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,GetSysColor(COLOR_3DSHADOW),0,0); 1343 else if((pChildInfo-> style&0x0000000F)==SS_WHITEFRAME)1344 else if((pChildInfo->GetStyle()&0x0000000F)==SS_WHITEFRAME) 1344 1345 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(255,255,255),0,0); 1345 else if((pChildInfo-> style&0x0000001F)==SS_ETCHEDFRAME){1346 else if((pChildInfo->GetStyle()&0x0000001F)==SS_ETCHEDFRAME){ 1346 1347 rect.left=pos.x+MdiInfo[WndNum].MdiRadInfo->ClientPos.x; 1347 1348 rect.top=pos.y+MdiInfo[WndNum].MdiRadInfo->ClientPos.y; … … 1350 1351 DrawEdge(hdc,&rect,EDGE_ETCHED,BF_RECT); 1351 1352 } 1352 else if((pChildInfo-> style&0x0000000F)==SS_BLACKRECT)1353 else if((pChildInfo->GetStyle()&0x0000000F)==SS_BLACKRECT) 1353 1354 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,GetSysColor(COLOR_3DDKSHADOW),GetSysColor(COLOR_3DDKSHADOW),1); 1354 else if((pChildInfo-> style&0x0000000F)==SS_GRAYRECT)1355 else if((pChildInfo->GetStyle()&0x0000000F)==SS_GRAYRECT) 1355 1356 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,GetSysColor(COLOR_3DSHADOW),GetSysColor(COLOR_3DSHADOW),1); 1356 else if((pChildInfo-> style&0x0000000F)==SS_WHITERECT)1357 else if((pChildInfo->GetStyle()&0x0000000F)==SS_WHITERECT) 1357 1358 DrawRectangleInClient(WndNum,pos.x,pos.y,pos.x+size.cx,pos.y+size.cy,RGB(255,255,255),RGB(255,255,255),1); 1358 else if((pChildInfo->style&0x0000000F)==SS_ICON){ 1359 if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_FILE) 1360 lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path); 1361 else{ 1362 for(i2=0;i2<projectInfo.resourceManager.iconResources.size();i2++) 1359 else if((pChildInfo->GetStyle()&0x0000000F)==SS_ICON) 1360 { 1361 if(pChildInfo->image.IsFile()) 1362 { 1363 lstrcpy(temporary,pChildInfo->image.path.c_str()); 1364 } 1365 else 1366 { 1367 bool isMatch = false; 1368 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1363 1369 { 1364 if( projectInfo.resourceManager.iconResources[i2].idName == pChildInfo->ImageCtrlInfo.path )1370 if( resourceItem.idName == pChildInfo->image.path ) 1365 1371 { 1372 isMatch = true; 1373 lstrcpy(temporary,resourceItem.filepath.c_str()); 1366 1374 break; 1367 1375 } 1368 1376 } 1369 if(i2==projectInfo.resourceManager.iconResources.size()) goto NonIconImage; 1370 1371 lstrcpy(temporary,projectInfo.resourceManager.iconResources[i2].filepath.c_str()); 1377 if( !isMatch ) 1378 { 1379 goto NonIconImage; 1380 } 1372 1381 } 1373 1382 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); … … 1380 1389 1381 1390 //ExStyleによる縁を再描画 1382 DrawItemEdgeByExStyle(WndNum,pChildInfo-> ExStyle,&pos,&size);1391 DrawItemEdgeByExStyle(WndNum,pChildInfo->GetExStyle(),&pos,&size); 1383 1392 1384 1393 DrawIcon(hdc, … … 1401 1410 } 1402 1411 } 1403 else if((pChildInfo-> style&0x0000000F)==SS_BITMAP){1412 else if((pChildInfo->GetStyle()&0x0000000F)==SS_BITMAP){ 1404 1413 BITMAP Bitmap; 1405 1414 1406 if(pChildInfo->ImageCtrlInfo.type==IMGTYPE_FILE) 1407 lstrcpy(temporary,pChildInfo->ImageCtrlInfo.path); 1415 if(pChildInfo->image.IsFile()) 1416 { 1417 lstrcpy(temporary,pChildInfo->image.path.c_str()); 1418 } 1408 1419 else{ 1409 for(i2=0;i2<projectInfo.resourceManager.bitmapResources.size();i2++){ 1410 if( projectInfo.resourceManager.bitmapResources[i2].idName == pChildInfo->ImageCtrlInfo.path ) 1420 bool isMatch = false; 1421 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 1422 { 1423 if( resourceItem.idName == pChildInfo->image.path ) 1411 1424 { 1425 lstrcpy(temporary,resourceItem.filepath.c_str()); 1426 isMatch = true; 1412 1427 break; 1413 1428 } 1414 1429 } 1415 if(i2==projectInfo.resourceManager.bitmapResources.size()) goto NonBitmapImage; 1416 1417 lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i2].filepath.c_str()); 1430 if( !isMatch ) 1431 { 1432 goto NonBitmapImage; 1433 } 1418 1434 } 1419 1435 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); … … 1428 1444 1429 1445 //ExStyleによる縁を再描画 1430 DrawItemEdgeByExStyle(WndNum,pChildInfo-> ExStyle,&pos,&size);1446 DrawItemEdgeByExStyle(WndNum,pChildInfo->GetExStyle(),&pos,&size); 1431 1447 1432 1448 memdc=CreateCompatibleDC(hdc); … … 1461 1477 1462 1478 //内部 1463 if(pChildInfo-> style&WS_DISABLED)1479 if(pChildInfo->GetStyle()&WS_DISABLED) 1464 1480 rgb=GetSysColor(COLOR_3DFACE); 1465 1481 else rgb=GetSysColor(COLOR_WINDOW); … … 1469 1485 rgb,rgb,1); 1470 1486 1471 if(pChildInfo-> style&LBS_DISABLENOSCROLL)1472 DrawWindowScrollBar(WndNum,pChildInfo-> style|WS_DISABLED,&pos,&size);1487 if(pChildInfo->GetStyle()&LBS_DISABLENOSCROLL) 1488 DrawWindowScrollBar(WndNum,pChildInfo->GetStyle()|WS_DISABLED,&pos,&size); 1473 1489 } 1474 1490 … … 1478 1494 1479 1495 //内部 1480 if(pChildInfo-> style&WS_DISABLED)1496 if(pChildInfo->GetStyle()&WS_DISABLED) 1481 1497 rgb=GetSysColor(COLOR_3DFACE); 1482 1498 else rgb=GetSysColor(COLOR_WINDOW); … … 1486 1502 rgb,rgb,1); 1487 1503 1488 if((pChildInfo-> style&LVS_REPORT)&&1489 (!((pChildInfo-> style&LVS_LIST)==LVS_LIST))){1504 if((pChildInfo->GetStyle()&LVS_REPORT)&& 1505 (!((pChildInfo->GetStyle()&LVS_LIST)==LVS_LIST))){ 1490 1506 //レポート ビュー 1491 1507 size.cy=16; … … 1504 1520 size.cy-=2; 1505 1521 rgb=GetSysColor(COLOR_ACTIVECAPTION); 1506 if(pChildInfo-> style&PBS_SMOOTH){1507 if(pChildInfo-> style&PBS_VERTICAL){1522 if(pChildInfo->GetStyle()&PBS_SMOOTH){ 1523 if(pChildInfo->GetStyle()&PBS_VERTICAL){ 1508 1524 pos.y+=(long)((double)size.cy*0.3); 1509 1525 DrawRectangleInClient(WndNum, … … 1520 1536 } 1521 1537 else{ 1522 if(pChildInfo-> style&PBS_VERTICAL){1538 if(pChildInfo->GetStyle()&PBS_VERTICAL){ 1523 1539 pos.y+=(long)((double)size.cy*0.3); 1524 1540 i3=(size.cx*2)/3; … … 1548 1564 // RadioButton コントロール 1549 1565 1550 if(pChildInfo-> style&BS_PUSHLIKE){1566 if(pChildInfo->GetStyle()&BS_PUSHLIKE){ 1551 1567 //ボタンの縁を描画 1552 1568 DrawButtonEdge(WndNum,&pos,&size); … … 1556 1572 size2.cx=12; 1557 1573 size2.cy=12; 1558 if(pChildInfo-> style&BS_LEFTTEXT)1574 if(pChildInfo->GetStyle()&BS_LEFTTEXT) 1559 1575 pos2.x=pos.x+size.cx-size2.cx; 1560 1576 else pos2.x=pos.x+1; 1561 if((pChildInfo-> style&BS_VCENTER)==BS_VCENTER||1562 (pChildInfo-> style&BS_VCENTER)==0)1577 if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER|| 1578 (pChildInfo->GetStyle()&BS_VCENTER)==0) 1563 1579 pos2.y=pos.y+(size.cy/2)-(size2.cy/2); 1564 else if(pChildInfo-> style&BS_TOP)1580 else if(pChildInfo->GetStyle()&BS_TOP) 1565 1581 pos2.y=pos.y+1; 1566 else if(pChildInfo-> style&BS_BOTTOM)1582 else if(pChildInfo->GetStyle()&BS_BOTTOM) 1567 1583 pos2.y=pos.y+size.cy-size2.cy-1; 1568 1584 … … 1575 1591 1576 1592 if(rgb==RGB(255,255,0)){ 1577 if(pWindowInfo-> bgColor==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE);1578 else rgb=-pWindowInfo-> bgColor;1593 if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE) rgb=GetSysColor(COLOR_3DFACE); 1594 else rgb=-pWindowInfo->GetBackgroundColor(); 1579 1595 } 1580 1596 … … 1589 1605 //内部 1590 1606 else if(rgb==RGB(255,255,255)){ 1591 if(pChildInfo-> style&WS_DISABLED) rgb=GetSysColor(COLOR_3DFACE);1607 if(pChildInfo->GetStyle()&WS_DISABLED) rgb=GetSysColor(COLOR_3DFACE); 1592 1608 } 1593 1609 … … 1607 1623 GlobalFree(pByte2); 1608 1624 1609 if(!(pChildInfo-> style&BS_LEFTTEXT)) pos.x+=17;1625 if(!(pChildInfo->GetStyle()&BS_LEFTTEXT)) pos.x+=17; 1610 1626 else pos.x++; 1611 1627 size.cx-=17; 1612 1628 } 1613 1629 1614 if(!(pChildInfo-> style&(BS_ICON|BS_BITMAP))){1630 if(!(pChildInfo->GetStyle()&(BS_ICON|BS_BITMAP))){ 1615 1631 //キャプション テキスト 1616 1632 rect.left=pos.x+1+MdiInfo[WndNum].MdiRadInfo->ClientPos.x; … … 1619 1635 rect.bottom=pos.y+size.cy-2+MdiInfo[WndNum].MdiRadInfo->ClientPos.y; 1620 1636 1621 if(pChildInfo-> style&BS_MULTILINE) i4=0;1637 if(pChildInfo->GetStyle()&BS_MULTILINE) i4=0; 1622 1638 else i4=DT_SINGLELINE; 1623 1639 1624 1640 //ビットを考慮してBS_CENTERを最初に比較する 1625 if((pChildInfo-> style&BS_CENTER)==BS_CENTER) i2=DT_CENTER;1626 else if(pChildInfo-> style&BS_LEFT) i2=DT_LEFT;1627 else if(pChildInfo-> style&BS_RIGHT) i2=DT_RIGHT;1641 if((pChildInfo->GetStyle()&BS_CENTER)==BS_CENTER) i2=DT_CENTER; 1642 else if(pChildInfo->GetStyle()&BS_LEFT) i2=DT_LEFT; 1643 else if(pChildInfo->GetStyle()&BS_RIGHT) i2=DT_RIGHT; 1628 1644 else i2=DT_LEFT; 1629 1645 1630 1646 //ビットを考慮してBS_VCENTERを最初に比較する 1631 if((pChildInfo-> style&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER;1632 else if(pChildInfo-> style&BS_TOP) i3=DT_TOP;1633 else if(pChildInfo-> style&BS_BOTTOM) i3=DT_BOTTOM;1647 if((pChildInfo->GetStyle()&BS_VCENTER)==BS_VCENTER) i3=DT_VCENTER; 1648 else if(pChildInfo->GetStyle()&BS_TOP) i3=DT_TOP; 1649 else if(pChildInfo->GetStyle()&BS_BOTTOM) i3=DT_BOTTOM; 1634 1650 else i3=DT_VCENTER; 1635 1651 1636 1652 hOldFont=(HFONT)SelectObject(hdc,hFont); 1637 if(pChildInfo-> style&WS_DISABLED){1653 if(pChildInfo->GetStyle()&WS_DISABLED){ 1638 1654 SetTextColor(hdc,RGB(255,255,255)); 1639 1655 rc2.left=rect.left+1; … … 1641 1657 rc2.right=rect.right+1; 1642 1658 rc2.bottom=rect.bottom+1; 1643 DrawText(hdc,pChildInfo-> caption,-1,&rc2,i4|i2|i3);1659 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i4|i2|i3); 1644 1660 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT)); 1645 1661 } 1646 1662 else SetTextColor(hdc,GetSysColor(COLOR_BTNTEXT)); 1647 1663 1648 DrawText(hdc,pChildInfo-> caption,-1,&rect,i4|i2|i3);1664 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i4|i2|i3); 1649 1665 SelectObject(hdc,hOldFont); 1650 1666 } … … 1662 1678 1663 1679 //ビットを考慮してSS_LEFTを最後に検討する 1664 if(pChildInfo-> style&SS_CENTER) i2=DT_CENTER;1665 else if(pChildInfo-> style&SS_RIGHT) i2=DT_RIGHT;1680 if(pChildInfo->GetStyle()&SS_CENTER) i2=DT_CENTER; 1681 else if(pChildInfo->GetStyle()&SS_RIGHT) i2=DT_RIGHT; 1666 1682 else i2=DT_LEFT; 1667 1683 1668 1684 hOldFont=(HFONT)SelectObject(hdc,hFont); 1669 if(pChildInfo-> style&WS_DISABLED){1685 if(pChildInfo->GetStyle()&WS_DISABLED){ 1670 1686 SetTextColor(hdc,RGB(255,255,255)); 1671 1687 rc2.left=rect.left+1; … … 1673 1689 rc2.right=rect.right+1; 1674 1690 rc2.bottom=rect.bottom+1; 1675 DrawText(hdc,pChildInfo-> caption,-1,&rc2,i2);1691 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rc2,i2); 1676 1692 SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT)); 1677 1693 } … … 1680 1696 1681 1697 //折り返すかどうか 1682 if(!(pChildInfo-> style&SS_LEFTNOWORDWRAP)){1698 if(!(pChildInfo->GetStyle()&SS_LEFTNOWORDWRAP)){ 1683 1699 i2|=DT_WORDBREAK; 1684 1700 } 1685 1701 1686 DrawText(hdc,pChildInfo-> caption,-1,&rect,i2);1702 DrawText(hdc,pChildInfo->GetCaption().c_str(),-1,&rect,i2); 1687 1703 SelectObject(hdc,hOldFont); 1688 1704 } … … 1692 1708 // TrackBar コントロール 1693 1709 1694 if(pChildInfo-> style&TBS_VERT){1710 if(pChildInfo->GetStyle()&TBS_VERT){ 1695 1711 pos.x+=2; 1696 1712 size.cx-=2; … … 1731 1747 1732 1748 //内部 1733 if(pChildInfo-> style&WS_DISABLED)1749 if(pChildInfo->GetStyle()&WS_DISABLED) 1734 1750 rgb=GetSysColor(COLOR_3DFACE); 1735 1751 else rgb=GetSysColor(COLOR_WINDOW); … … 1743 1759 /////////////////////////////// 1744 1760 // アップ ダウン コントロール 1745 if(pChildInfo-> style&UDS_HORZ)1746 DrawUpDownControl(WndNum,pChildInfo-> style,0,&pos,&size);1747 else DrawUpDownControl(WndNum,pChildInfo-> style,1,&pos,&size);1761 if(pChildInfo->GetStyle()&UDS_HORZ) 1762 DrawUpDownControl(WndNum,pChildInfo->GetStyle(),0,&pos,&size); 1763 else DrawUpDownControl(WndNum,pChildInfo->GetStyle(),1,&pos,&size); 1748 1764 } 1749 1765 … … 1751 1767 //////////////////////////////////// 1752 1768 // 垂直スクロールバー コントロール 1753 DrawScrollBar(WndNum,pChildInfo-> style,1,&pos,&size);1769 DrawScrollBar(WndNum,pChildInfo->GetStyle(),1,&pos,&size); 1754 1770 } 1755 1771 } 1756 1772 DeleteObject(hFont); 1757 1773 } 1758 void DrawRadWindow(int WndNum,const WindowInfo *pWindowInfo){1774 void DrawRadWindow(int WndNum,const ActiveBasic::PM::WindowInfo *pWindowInfo){ 1759 1775 extern MDIINFO MdiInfo[MAX_WNDNUM]; 1760 1776 HBRUSH hOldBrush; -
trunk/ab5.0/abdev/abdev/MenuProc.cpp
r618 r624 11 11 #endif 12 12 13 int GetMenuInfoNum(c har *name){13 int GetMenuInfoNum(const char *name){ 14 14 int i; 15 15 for(i=0;i<projectInfo.NumberOfMenu;i++){ -
trunk/ab5.0/abdev/abdev/MessageCallOperation.cpp
r620 r624 20 20 if(lstrcmp(EventName,"MenuClick")==0) return CT_MENU; 21 21 22 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];23 BOOST_FOREACH( CHILDINFO*pChildInfo, pWindowInfo->childWindowInfos )22 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 23 BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos ) 24 24 { 25 if( lstrcmp(buffer,pChildInfo->IdName)==0)25 if( pChildInfo->GetName() == buffer ) 26 26 { 27 27 return pChildInfo->Control; … … 36 36 char *buffer,**ppNames,temporary[MAX_PATH],temp2[MAX_PATH]; 37 37 38 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];38 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 39 39 40 40 NameLen=pWindowInfo->GetName().size(); … … 135 135 POINT pos; 136 136 137 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];137 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 138 138 139 139 hChild=OpenFileWithExtension( projectInfo.GetWorkDir().GetPath() + pWindowInfo->filepath ); … … 220 220 char temporary[MAX_PATH]; 221 221 222 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];222 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 223 223 224 224 MaxCount=ListView_GetItemCount(hList); … … 298 298 sprintf(EventName,"%s_%s_%s", 299 299 pWindowInfo->GetName().c_str(), 300 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> IdName,300 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetName().c_str(), 301 301 temporary); 302 302 break; … … 403 403 404 404 WndNum=GetWndNum(GetWindow(hClient,GW_CHILD)); 405 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);405 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path); 406 406 i=0; 407 407 if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){ … … 441 441 //メニュー イベント 442 442 SendDlgItemMessage(hDlg,IDC_MENU,BM_SETCHECK,BST_CHECKED,0); 443 if(pWindowInfo->MenuID){ 443 if( pWindowInfo->HasMenu() ) 444 { 444 445 int MenuInfoNum; 445 MenuInfoNum=GetMenuInfoNum(pWindowInfo-> MenuID);446 MenuInfoNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str()); 446 447 i=0; 447 448 i2=0; … … 647 648 { 648 649 WndNum=GetWndNum(GetWindow(hClient,GW_CHILD)); 649 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);650 NowMenuNum=GetMenuInfoNum(pWindowInfo-> MenuID);650 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path); 651 NowMenuNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str()); 651 652 } 652 653 break; -
trunk/ab5.0/abdev/abdev/ProjectControl.cpp
r623 r624 191 191 } 192 192 } 193 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 194 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 193 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 194 { 195 if( resourceItem.hTreeItem == hTreeItem ) 196 { 195 197 NewIconEditWindow( 196 projectInfo.GetWorkDir().GetFullPath( projectInfo.resourceManager.iconResources[i].filepath ).c_str()198 projectInfo.GetWorkDir().GetFullPath( resourceItem.filepath ).c_str() 197 199 ); 198 200 break; … … 202 204 case IDM_MATERIALTREE_DELETE: 203 205 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 204 for(i=0;i< projectInfo.resourceManager.cursorResources.size();i++){206 for(i=0;i<static_cast<int>(projectInfo.resourceManager.cursorResources.size());i++){ 205 207 if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){ 206 208 … … 213 215 } 214 216 } 215 for(i=0;i< projectInfo.resourceManager.bitmapResources.size();i++){217 for(i=0;i<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i++){ 216 218 if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){ 217 219 … … 224 226 } 225 227 } 226 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){228 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 227 229 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 228 230 … … 261 263 extern char NewIdName[MAX_PATH]; 262 264 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 263 for(i=0;i< projectInfo.resourceManager.cursorResources.size();i++){265 for(i=0;i<static_cast<int>(projectInfo.resourceManager.cursorResources.size());i++){ 264 266 if(projectInfo.resourceManager.cursorResources[i].hTreeItem==hTreeItem){ 265 267 Project_Cursor_RenameID(i); … … 267 269 } 268 270 } 269 for(i=0;i< projectInfo.resourceManager.bitmapResources.size();i++){271 for(i=0;i<static_cast<int>(projectInfo.resourceManager.bitmapResources.size());i++){ 270 272 if(projectInfo.resourceManager.bitmapResources[i].hTreeItem==hTreeItem){ 271 273 Project_Bitmap_RenameID(i); … … 273 275 } 274 276 } 275 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){277 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 276 278 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 277 279 Project_Icon_RenameID(i); … … 314 316 case IDM_MATERIALTREE_ICON_SETMAIN: 315 317 hTreeItem=TreeView_GetSelection(hMaterialTreeView); 316 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){318 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 317 319 if(projectInfo.resourceManager.iconResources[i].hTreeItem==hTreeItem){ 318 320 if(i==0) break; … … 1052 1054 // ウィンドウ定義ファイル(*.wnd)を作成 1053 1055 ///////////////////////////////////////// 1054 WindowInfos windowInfos;1055 windowInfos.push_back( new WindowInfo() );1056 ActiveBasic::PM::WindowInfos windowInfos; 1057 windowInfos.push_back( new ActiveBasic::PM::WindowInfo() ); 1056 1058 windowInfos.back()->SetName( "MainWnd" ); 1057 1059 windowInfos.back()->SetHandleName( "hMainWnd" ); … … 1060 1062 windowInfos.back()->size.cx=480; 1061 1063 windowInfos.back()->size.cy=360; 1062 windowInfos.back()-> caption=NewProjectInfo.name;1064 windowInfos.back()->SetCaption( NewProjectInfo.name ); 1063 1065 if(NewProjectInfo.dwTypeID==IDC_EXE_WINDOWBASE) 1064 windowInfos.back()->style=WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_VISIBLE; 1066 { 1067 windowInfos.back()->SetStyle( WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_VISIBLE ); 1068 } 1065 1069 else if(NewProjectInfo.dwTypeID==IDC_EXE_DIRECTX) 1066 windowInfos.back()->style=WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU; 1067 windowInfos.back()->ExStyle=0; 1068 windowInfos.back()->MenuID=0; 1069 windowInfos.back()->id=0; 1070 windowInfos.back()->bgColor=COLOR_3DFACE; 1070 { 1071 windowInfos.back()->SetStyle( WS_OVERLAPPED|WS_THICKFRAME|WS_SYSMENU ); 1072 } 1073 windowInfos.back()->SetExStyle( 0 ); 1074 windowInfos.back()->SetMenuIdName( "" ); 1075 windowInfos.back()->SetBackgroundColor( COLOR_3DFACE ); 1071 1076 GetDefaultWindowFont(&windowInfos.back()->LogFont); 1072 windowInfos.back()-> IconResName=0;1073 windowInfos.back()-> ClassName="NORMAL";1077 windowInfos.back()->SetIconResourceName( "" ); 1078 windowInfos.back()->SetClassName( "NORMAL" ); 1074 1079 windowInfos.back()->CallBackName="MainWndProc"; 1075 1080 windowInfos.back()->type=WNDTYPE_DEFAULT; … … 1142 1147 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1143 1148 hCursorTreeItemForProjectView = tv.hParent; 1144 for(i=0;i<projectInfo.resourceManager.cursorResources.size();i++){ 1149 BOOST_FOREACH( ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.cursorResources ) 1150 { 1145 1151 tv.item.iImage=6; 1146 1152 tv.item.iSelectedImage=6; 1147 lstrcpy( temporary, projectInfo.resourceManager.cursorResources[i].idName.c_str() );1153 lstrcpy( temporary, resourceItem.idName.c_str() ); 1148 1154 tv.item.pszText=temporary; 1149 projectInfo.resourceManager.cursorResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1155 resourceItem.hTreeItem = TreeView_InsertItem(hMaterialTreeView,&tv); 1150 1156 } 1151 1157 … … 1158 1164 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1159 1165 hBitmapTreeItemForProjectView = tv.hParent; 1160 for(i=0;i<projectInfo.resourceManager.bitmapResources.size();i++){ 1166 BOOST_FOREACH( ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 1167 { 1161 1168 tv.item.iImage=5; 1162 1169 tv.item.iSelectedImage=5; 1163 lstrcpy( temporary, projectInfo.resourceManager.bitmapResources[i].idName.c_str() );1170 lstrcpy( temporary, resourceItem.idName.c_str() ); 1164 1171 tv.item.pszText=temporary; 1165 projectInfo.resourceManager.bitmapResources[i].hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);1172 resourceItem.hTreeItem = TreeView_InsertItem(hMaterialTreeView,&tv); 1166 1173 } 1167 1174 … … 1174 1181 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1175 1182 hIconTreeItemForProjectView = tv.hParent; 1176 for(i=0;i< projectInfo.resourceManager.iconResources.size();i++){1183 for(i=0;i<static_cast<int>(projectInfo.resourceManager.iconResources.size());i++){ 1177 1184 tv.item.iImage=4; 1178 1185 tv.item.iSelectedImage=4; … … 1209 1216 tv.hParent=TreeView_InsertItem(hMaterialTreeView,&tv); 1210 1217 projectInfo.hWindowTreeItem=tv.hParent; 1211 BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )1218 BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos ) 1212 1219 { 1213 1220 tv.item.iImage=2; … … 1356 1363 } 1357 1364 } 1358 else if(lstrcmpi(temporary,"icon")==0){ 1359 for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){ 1360 if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){ 1365 else if(lstrcmpi(temporary,"icon")==0) 1366 { 1367 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1368 { 1369 if(lstrcmpi(resourceItem.filepath.c_str(),temp2)==0){ 1361 1370 NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() ); 1362 1371 break; … … 1478 1487 } 1479 1488 else if(lstrcmpi(temporary,"icon")==0){ 1480 for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++){ 1481 if(lstrcmpi(projectInfo.resourceManager.iconResources[i3].filepath.c_str(),temp2)==0){ 1489 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1490 { 1491 if(lstrcmpi(resourceItem.filepath.c_str(),temp2)==0){ 1482 1492 NewIconEditWindow( projectInfo.GetWorkDir().GetFullPath( temp2 ).c_str() ); 1483 1493 break; … … 1597 1607 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1598 1608 if(MdiInfo[WndNum].MdiIconEditInfo->bModify){ 1599 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 1600 lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str()); 1609 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1610 { 1611 lstrcpy(temporary,resourceItem.filepath.c_str()); 1601 1612 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); 1602 1613 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1; … … 1671 1682 } 1672 1683 else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){ 1673 BOOST_FOREACH( WindowInfo *pWindowInfo, projectInfo.windowInfos )1684 BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos ) 1674 1685 { 1675 1686 if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str())==0){ … … 1690 1701 } 1691 1702 else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){ 1692 for(i=0;i<projectInfo.resourceManager.iconResources.size();i++){ 1693 lstrcpy(temporary,projectInfo.resourceManager.iconResources[i].filepath.c_str()); 1703 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 1704 { 1705 lstrcpy(temporary,resourceItem.filepath.c_str()); 1694 1706 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() ); 1695 1707 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){ 1696 sprintf(buffer+i2,"icon,%s\r\n", projectInfo.resourceManager.iconResources[i].filepath.c_str());1708 sprintf(buffer+i2,"icon,%s\r\n",resourceItem.filepath.c_str()); 1697 1709 i2+=lstrlen(buffer+i2); 1698 1710 break; -
trunk/ab5.0/abdev/abdev/RadProc.cpp
r618 r624 4 4 #include "common.h" 5 5 6 void NewRadWindow( const WindowInfo &windowInfo )6 void NewRadWindow( const ActiveBasic::PM::WindowInfo &windowInfo ) 7 7 { 8 8 extern HINSTANCE hInst,hResInst; … … 153 153 } 154 154 155 int InsertDlgItem(int WndNum,int WndInfoNum,int ItemNum,POINT *pPos,SIZE *pSize,c har *IdName,char *caption,DWORD style_or_WndNum,DWORD ExStyle,int Control,int ImageType,char *ImagePath,DWORD dwInsertType){155 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){ 156 156 //dwInsertType 157 157 //0 … 元に戻す、やり直し … … 164 164 char temporary[MAX_PATH]; 165 165 166 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];167 168 CHILDINFO *pChildInfo = new CHILDINFO();166 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 167 168 ActiveBasic::PM::ChildWindowInfo *pChildInfo = new ActiveBasic::PM::ChildWindowInfo(); 169 169 170 170 if(ItemNum==-1) … … 175 175 else 176 176 { 177 std::vector<CHILDINFO *>::iterator it = pWindowInfo->childWindowInfos.begin();177 ActiveBasic::PM::ChildWindowInfos::iterator it = pWindowInfo->childWindowInfos.begin(); 178 178 for( int i=0; i<ItemNum; i++ ) 179 179 { … … 187 187 //ID 188 188 if(ItemNum==-1){ 189 for(i=lstrlen(IdName)-1;i>=0;i--){ 190 if(!('0'<=IdName[i]&&IdName[i]<='9')) break; 189 char temp2[1024]; 190 lstrcpy( temp2, IdName ); 191 for(i=lstrlen(temp2)-1;i>=0;i--){ 192 if(!('0'<=temp2[i]&&temp2[i]<='9')) break; 191 193 } 192 194 i++; 193 195 194 if( IdName[i]!='\0'){195 i2=atoi( IdName+i)+1;196 if(temp2[i]!='\0'){ 197 i2=atoi(temp2+i)+1; 196 198 if(dwInsertType==2) i2--; 197 IdName[i]=0;199 temp2[i]=0; 198 200 } 199 201 else{ … … 202 204 } 203 205 204 if(i2==0) lstrcpy(temporary, IdName);205 else sprintf(temporary,"%s%d", IdName,i2);206 if(i2==0) lstrcpy(temporary,temp2); 207 else sprintf(temporary,"%s%d",temp2,i2); 206 208 SearchStart: 207 for(i=0;i<pWindowInfo->childWindowInfos.size();i++){ 208 if(i!=NewItemNum){ 209 if(lstrcmp(pWindowInfo->childWindowInfos[i]->IdName,temporary)==0){ 209 for( i=0; i<static_cast<int>(pWindowInfo->childWindowInfos.size()); i++ ) 210 { 211 if( i != NewItemNum ) 212 { 213 if( pWindowInfo->childWindowInfos[i]->GetName() == temporary ) 214 { 210 215 i2++; 211 sprintf(temporary,"%s%d", IdName,i2);216 sprintf(temporary,"%s%d",temp2,i2); 212 217 goto SearchStart; 213 218 } … … 216 221 } 217 222 else lstrcpy(temporary,IdName); 218 pChildInfo->IdName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1); 219 lstrcpy(pChildInfo->IdName,temporary); 223 pChildInfo->SetName( temporary ); 220 224 221 225 //位置 … … 235 239 } 236 240 else lstrcpy(temporary,caption); 237 pChildInfo->caption=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1); 238 lstrcpy(pChildInfo->caption,temporary); 241 pChildInfo->SetCaption( temporary ); 239 242 240 243 //スタイル 241 pChildInfo-> style=style_or_WndNum;244 pChildInfo->SetStyle( style_or_WndNum ); 242 245 243 246 //拡張スタイル 244 pChildInfo-> ExStyle=ExStyle;247 pChildInfo->SetExStyle( ExStyle ); 245 248 246 249 //クラス名 … … 249 252 if(Control==CT_IMAGEBOX){ 250 253 //イメージ ボックスの場合 251 pChildInfo-> ImageCtrlInfo.type=ImageType;254 pChildInfo->image.type = ImageType; 252 255 if(!ImagePath) 253 pChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1); 256 { 257 pChildInfo->image.path = ""; 258 } 254 259 else{ 255 pChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,lstrlen(ImagePath)+1); 256 lstrcpy(pChildInfo->ImageCtrlInfo.path,ImagePath); 260 pChildInfo->image.path = ImagePath; 257 261 } 258 262 } … … 269 273 extern MDIINFO MdiInfo[MAX_WNDNUM]; 270 274 271 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];275 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 272 276 273 277 //変更情報 … … 276 280 277 281 //子ウィンドウのメモリを解放 278 HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->IdName);279 HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->caption);280 if(pWindowInfo->childWindowInfos[ItemNum]->Control==CT_IMAGEBOX){281 //イメージ ボックスの場合282 HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->ImageCtrlInfo.path);283 }284 282 delete pWindowInfo->childWindowInfos[ItemNum]; 285 283 286 std::vector<CHILDINFO *>::iterator it = pWindowInfo->childWindowInfos.begin();284 ActiveBasic::PM::ChildWindowInfos::iterator it = pWindowInfo->childWindowInfos.begin(); 287 285 for( int i=0; i<ItemNum; i++ ) 288 286 { … … 346 344 RECT rect; 347 345 348 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];346 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 349 347 350 348 hdc=GetDC(hwnd); … … 352 350 sw=0; 353 351 if(pobj_nv->bLineAdjust&&bLA){ 354 for(i=0;i<pWindowInfo->childWindowInfos.size();i++){ 355 const CHILDINFO *pChildInfo = pWindowInfo->childWindowInfos[i]; 352 for( i=0; i<static_cast<int>(pWindowInfo->childWindowInfos.size()); i++ ) 353 { 354 const ActiveBasic::PM::ChildWindowInfo *pChildInfo = pWindowInfo->childWindowInfos[i]; 356 355 if(i==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]) continue; 357 356 if(pChildInfo->Control != … … 449 448 extern MDIINFO MdiInfo[MAX_WNDNUM]; 450 449 451 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];450 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 452 451 453 452 if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]==SELECT_WINDOW){ … … 546 545 SCROLLINFO ScrollInfo; 547 546 548 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];547 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 549 548 550 549 DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg); … … 607 606 int i; 608 607 609 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];608 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 610 609 611 610 for(i=pWindowInfo->childWindowInfos.size()-1;i>=0;i--){ 612 611 if(pWindowInfo->childWindowInfos[i]->Control==CT_COMBOBOX&& 613 (pWindowInfo->childWindowInfos[i]-> style&0x000F)!=CBS_SIMPLE){612 (pWindowInfo->childWindowInfos[i]->GetStyle()&0x000F)!=CBS_SIMPLE){ 614 613 //コンボ ボックスの場合は表示部分をターゲットに選択する(高さ20pixel) 615 614 if(x>=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&& … … 676 675 RECT rect; 677 676 678 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];677 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 679 678 680 679 for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]=-1; … … 701 700 RECT rect; 702 701 703 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];702 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 704 703 705 704 if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1){ … … 762 761 SIZE NeedSize; 763 762 764 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);763 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path); 765 764 766 765 //必要な幅、高さを共に100ピクセル余裕を持たせる … … 817 816 i=GetWndNum(GetParent(hwnd)); 818 817 i2 = GetWndInfoNum(MdiInfo[i].path); 819 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);818 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 820 819 821 820 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ … … 897 896 i=GetWndNum(hParent); 898 897 i2 = GetWndInfoNum(MdiInfo[i].path); 899 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);898 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 900 899 901 900 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ … … 966 965 size.cx=rect.right-rect.left; 967 966 size.cy=rect.bottom-rect.top; 968 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"CommandButton","Button",WS_CHILD|WS_VISIBLE,0,CT_BUTTON,0,0,1); 967 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 968 i, 969 i2, 970 -1, 971 &pos, 972 &size, 973 "CommandButton", 974 "Button", 975 WS_CHILD|WS_VISIBLE,0,CT_BUTTON, 976 ActiveBasic::PM::ImageReferenceType::File, 977 0, 978 1 979 ); 969 980 } 970 981 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_CHECKBOX){ … … 985 996 size.cx=rect.right-rect.left; 986 997 size.cy=rect.bottom-rect.top; 987 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); 998 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem( 999 i, 1000 i2, 1001 -1, 1002 &pos, 1003 &size, 1004 "CheckBox", 1005 "Check", 1006 WS_CHILD|WS_VISIBLE|BS_AUTOCHECKBOX, 1007 0, 1008 CT_CHECKBOX, 1009 ActiveBasic::PM::ImageReferenceType::File, 1010 0, 1011 1 1012 ); 988 1013 } 989 1014 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_COMBOBOX){ … … 1004 1029 size.cx=rect.right-rect.left; 1005 1030 size.cy=rect.bottom-rect.top; 1006 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); 1031 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1032 i, 1033 i2, 1034 -1, 1035 &pos, 1036 &size, 1037 "ComboBox", 1038 "", 1039 WS_CHILD|WS_VISIBLE|CBS_DROPDOWN|CBS_SORT|WS_VSCROLL, 1040 0, 1041 CT_COMBOBOX, 1042 ActiveBasic::PM::ImageReferenceType::File, 1043 0, 1044 1 1045 ); 1007 1046 } 1008 1047 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_EDIT){ … … 1023 1062 size.cx=rect.right-rect.left; 1024 1063 size.cy=rect.bottom-rect.top; 1025 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"EditBox","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_EDIT,0,0,1); 1064 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1065 i, 1066 i2, 1067 -1, 1068 &pos, 1069 &size, 1070 "EditBox", 1071 "", 1072 WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE, 1073 CT_EDIT, 1074 ActiveBasic::PM::ImageReferenceType::File, 1075 0, 1076 1 1077 ); 1026 1078 } 1027 1079 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_GROUPBOX){ … … 1042 1094 size.cx=rect.right-rect.left; 1043 1095 size.cy=rect.bottom-rect.top; 1044 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); 1096 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1097 i, 1098 i2, 1099 -1, 1100 &pos, 1101 &size, 1102 "GroupBox", 1103 "Group", 1104 WS_CHILD|WS_VISIBLE|BS_GROUPBOX, 1105 0, 1106 CT_GROUPBOX, 1107 ActiveBasic::PM::ImageReferenceType::File, 1108 0, 1109 1 1110 ); 1045 1111 } 1046 1112 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_HSCROLLBAR){ … … 1061 1127 size.cx=rect.right-rect.left; 1062 1128 size.cy=rect.bottom-rect.top; 1063 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"HScrollBar","",WS_CHILD|WS_VISIBLE|SBS_HORZ,0,CT_HSCROLLBAR,0,0,1); 1129 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem( 1130 i, 1131 i2, 1132 -1, 1133 &pos, 1134 &size, 1135 "HScrollBar", 1136 "", 1137 WS_CHILD|WS_VISIBLE|SBS_HORZ, 1138 0, 1139 CT_HSCROLLBAR, 1140 ActiveBasic::PM::ImageReferenceType::File, 1141 0, 1142 1 1143 ); 1064 1144 } 1065 1145 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_IMAGEBOX){ … … 1080 1160 size.cx=rect.right-rect.left; 1081 1161 size.cy=rect.bottom-rect.top; 1082 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); 1162 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1163 i, 1164 i2, 1165 -1, 1166 &pos, 1167 &size, 1168 "ImageBox", 1169 "", 1170 WS_CHILD|WS_VISIBLE|SS_BLACKFRAME,0,CT_IMAGEBOX, 1171 ActiveBasic::PM::ImageReferenceType::File, 1172 0, 1173 1 1174 ); 1083 1175 } 1084 1176 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTBOX){ … … 1099 1191 size.cx=rect.right-rect.left; 1100 1192 size.cy=rect.bottom-rect.top; 1101 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); 1193 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1194 i, 1195 i2, 1196 -1, 1197 &pos, 1198 &size, 1199 "ListBox", 1200 "", 1201 WS_CHILD|WS_VISIBLE|WS_VSCROLL|LBS_SORT|LBS_NOTIFY,WS_EX_CLIENTEDGE, 1202 CT_LISTBOX, 1203 ActiveBasic::PM::ImageReferenceType::File, 1204 0, 1205 1 1206 ); 1102 1207 } 1103 1208 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTVIEW){ … … 1118 1223 size.cx=rect.right-rect.left; 1119 1224 size.cy=rect.bottom-rect.top; 1120 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ListView","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_LISTVIEW,0,0,1); 1225 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1226 i, 1227 i2, 1228 -1, 1229 &pos, 1230 &size, 1231 "ListView", 1232 "", 1233 WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE, 1234 CT_LISTVIEW, 1235 ActiveBasic::PM::ImageReferenceType::File, 1236 0, 1237 1 1238 ); 1121 1239 } 1122 1240 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_PROGRESSBAR){ … … 1137 1255 size.cx=rect.right-rect.left; 1138 1256 size.cy=rect.bottom-rect.top; 1139 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ProgressBar","",WS_CHILD|WS_VISIBLE,WS_EX_STATICEDGE,CT_PROGRESSBAR,0,0,1); 1257 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1258 i, 1259 i2, 1260 -1, 1261 &pos, 1262 &size, 1263 "ProgressBar", 1264 "", 1265 WS_CHILD|WS_VISIBLE,WS_EX_STATICEDGE, 1266 CT_PROGRESSBAR, 1267 ActiveBasic::PM::ImageReferenceType::File, 1268 0, 1269 1 1270 ); 1140 1271 } 1141 1272 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_RADIOBUTTON){ … … 1156 1287 size.cx=rect.right-rect.left; 1157 1288 size.cy=rect.bottom-rect.top; 1158 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); 1289 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1290 i, 1291 i2, 1292 -1, 1293 &pos, 1294 &size, 1295 "RadioButton", 1296 "radio", 1297 WS_CHILD|WS_VISIBLE|BS_AUTORADIOBUTTON, 1298 0, 1299 CT_RADIOBUTTON, 1300 ActiveBasic::PM::ImageReferenceType::File, 1301 0, 1302 1 1303 ); 1159 1304 } 1160 1305 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_STATIC){ … … 1175 1320 size.cx=rect.right-rect.left; 1176 1321 size.cy=rect.bottom-rect.top; 1177 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"Static","Text",WS_CHILD|WS_VISIBLE,0,CT_STATIC,0,0,1); 1322 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1323 i, 1324 i2, 1325 -1, 1326 &pos, 1327 &size, 1328 "Static", 1329 "Text", 1330 WS_CHILD|WS_VISIBLE, 1331 0, 1332 CT_STATIC, 1333 ActiveBasic::PM::ImageReferenceType::File, 1334 0, 1335 1 1336 ); 1178 1337 } 1179 1338 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TRACKBAR){ … … 1194 1353 size.cx=rect.right-rect.left; 1195 1354 size.cy=rect.bottom-rect.top; 1196 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); 1355 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1356 i, 1357 i2, 1358 -1, 1359 &pos, 1360 &size, 1361 "TrackBar", 1362 "", 1363 WS_CHILD|WS_VISIBLE|TBS_BOTH|TBS_NOTICKS, 1364 0, 1365 CT_TRACKBAR, 1366 ActiveBasic::PM::ImageReferenceType::File, 1367 0, 1368 1 1369 ); 1197 1370 } 1198 1371 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TREEVIEW){ … … 1213 1386 size.cx=rect.right-rect.left; 1214 1387 size.cy=rect.bottom-rect.top; 1215 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"TreeView","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_TREEVIEW,0,0,1); 1388 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1389 i, 1390 i2, 1391 -1, 1392 &pos, 1393 &size, 1394 "TreeView", 1395 "", 1396 WS_CHILD|WS_VISIBLE, 1397 WS_EX_CLIENTEDGE, 1398 CT_TREEVIEW, 1399 ActiveBasic::PM::ImageReferenceType::File, 1400 0, 1401 1 1402 ); 1216 1403 } 1217 1404 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_UPDOWN){ … … 1232 1419 size.cx=rect.right-rect.left; 1233 1420 size.cy=rect.bottom-rect.top; 1234 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"UpDown","",WS_CHILD|WS_VISIBLE,0,CT_UPDOWN,0,0,1); 1421 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1422 i, 1423 i2, 1424 -1, 1425 &pos, 1426 &size, 1427 "UpDown", 1428 "", 1429 WS_CHILD|WS_VISIBLE, 1430 0, 1431 CT_UPDOWN, 1432 ActiveBasic::PM::ImageReferenceType::File, 1433 0, 1434 1 1435 ); 1235 1436 } 1236 1437 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_VSCROLLBAR){ … … 1251 1452 size.cx=rect.right-rect.left; 1252 1453 size.cy=rect.bottom-rect.top; 1253 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"VScrollBar","",WS_CHILD|WS_VISIBLE|SBS_VERT,0,CT_VSCROLLBAR,0,0,1); 1454 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1455 i, 1456 i2, 1457 -1, 1458 &pos, 1459 &size, 1460 "VScrollBar", 1461 "", 1462 WS_CHILD|WS_VISIBLE|SBS_VERT, 1463 0, 1464 CT_VSCROLLBAR, 1465 ActiveBasic::PM::ImageReferenceType::File, 1466 0, 1467 1 1468 ); 1254 1469 } 1255 1470 SendMessage(GetWindow(MdiInfo[i].MdiRadInfo->hTools,GW_CHILD),WM_COMMAND,IDC_TOOL_MOUSE,0); … … 1275 1490 i=GetWndNum(hParent); 1276 1491 i2 = GetWndInfoNum(MdiInfo[i].path); 1277 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1492 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1278 1493 1279 1494 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ … … 1440 1655 i=GetWndNum(hParent); 1441 1656 i2=GetWndInfoNum(MdiInfo[i].path); 1442 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1657 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1443 1658 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ 1444 1659 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){ … … 1452 1667 sprintf(temporary,"%s_%s_Click", 1453 1668 pWindowInfo->GetName().c_str(), 1454 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName1669 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str() 1455 1670 ); 1456 1671 } … … 1459 1674 sprintf(temporary,"%s_%s_EditChange", 1460 1675 pWindowInfo->GetName().c_str(), 1461 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1676 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1462 1677 } 1463 1678 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT) … … 1465 1680 sprintf(temporary,"%s_%s_Change", 1466 1681 pWindowInfo->GetName().c_str(), 1467 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1682 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1468 1683 } 1469 1684 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX) … … 1471 1686 sprintf(temporary,"%s_%s_SelChange", 1472 1687 pWindowInfo->GetName().c_str(), 1473 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1688 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1474 1689 } 1475 1690 else temporary[0]=0; … … 1483 1698 hParent=GetParent(hwnd); 1484 1699 i=GetWndNum(hParent); 1485 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1700 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1486 1701 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ 1487 1702 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){ -
trunk/ab5.0/abdev/abdev/RadSupport.cpp
r623 r624 40 40 HFONT *lphFont; 41 41 HANDLE *lphImage; 42 int i2 ,i3;42 int i2; 43 43 char temporary[MAX_PATH]; 44 44 … … 50 50 } 51 51 52 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];53 54 if(pWindowInfo-> style&WS_CHILD){52 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 53 54 if(pWindowInfo->GetStyle()&WS_CHILD){ 55 55 //"チャイルドウィンドウをテスト表示することはできません" 56 56 MessageBox(hOwner,STRING_RAD_ERROR_CANT_CHILDTEST,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION); … … 64 64 65 65 //テスト用のメインウィンドウを作成 66 hWnd=CreateWindowEx(pWindowInfo-> ExStyle,66 hWnd=CreateWindowEx(pWindowInfo->GetExStyle(), 67 67 "TestWindow", 68 68 pWindowInfo->GetName().c_str(), 69 pWindowInfo-> style|WS_VISIBLE,69 pWindowInfo->GetStyle()|WS_VISIBLE, 70 70 CW_USEDEFAULT,CW_USEDEFAULT, 71 71 pWindowInfo->size.cx,pWindowInfo->size.cy, … … 73 73 74 74 //子ウィンドウ作成 75 for(i2=0;i2<pWindowInfo->childWindowInfos.size();i2++){ 75 for( i2=0; i2<static_cast<int>(pWindowInfo->childWindowInfos.size()); i2++ ) 76 { 76 77 if(pWindowInfo->childWindowInfos[i2]->Control==CT_UPDOWN){ 77 78 CreateUpDownControl( 78 pWindowInfo->childWindowInfos[i2]-> style,79 pWindowInfo->childWindowInfos[i2]->GetStyle(), 79 80 pWindowInfo->childWindowInfos[i2]->pos.x,pWindowInfo->childWindowInfos[i2]->pos.y, 80 81 pWindowInfo->childWindowInfos[i2]->size.cx,pWindowInfo->childWindowInfos[i2]->size.cy, … … 85 86 GetItemClassName(temporary,pWindowInfo->childWindowInfos[i2]->Control); 86 87 hChild=CreateWindowEx( 87 pWindowInfo->childWindowInfos[i2]-> ExStyle,88 pWindowInfo->childWindowInfos[i2]->GetExStyle(), 88 89 temporary, 89 pWindowInfo->childWindowInfos[i2]-> caption,90 pWindowInfo->childWindowInfos[i2]-> style,90 pWindowInfo->childWindowInfos[i2]->GetCaption().c_str(), 91 pWindowInfo->childWindowInfos[i2]->GetStyle(), 91 92 pWindowInfo->childWindowInfos[i2]->pos.x, 92 93 pWindowInfo->childWindowInfos[i2]->pos.y, … … 102 103 // イメージ ボックスの場合 103 104 /////////////////////////// 104 if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_ICON){ 105 if(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.type==IMGTYPE_FILE) 106 lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path); 107 else{ 108 for(i3=0;i3<projectInfo.resourceManager.iconResources.size();i3++) 105 if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_ICON){ 106 if(pWindowInfo->childWindowInfos[i2]->image.IsFile()) 107 { 108 lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->image.path.c_str()); 109 } 110 else 111 { 112 temporary[0] = 0; 113 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 109 114 { 110 if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path )115 if( resourceItem.idName == pWindowInfo->childWindowInfos[i2]->image.path ) 111 116 { 117 lstrcpy( temporary, resourceItem.filepath.c_str() ); 112 118 break; 113 119 } 114 120 } 115 if(i3==projectInfo.resourceManager.iconResources.size()) temporary[0]=0;116 else lstrcpy(temporary,projectInfo.resourceManager.iconResources[i3].filepath.c_str());117 121 } 118 122 if(temporary[0]){ … … 123 127 } 124 128 } 125 else if((pWindowInfo->childWindowInfos[i2]->style&0x000F)==SS_BITMAP){ 126 if(pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.type==IMGTYPE_FILE) 127 lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path); 128 else{ 129 for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++){ 130 if( projectInfo.resourceManager.bitmapResources[i3].idName == pWindowInfo->childWindowInfos[i2]->ImageCtrlInfo.path ) 129 else if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_BITMAP){ 130 if(pWindowInfo->childWindowInfos[i2]->image.IsFile()) 131 { 132 lstrcpy(temporary,pWindowInfo->childWindowInfos[i2]->image.path.c_str()); 133 } 134 else 135 { 136 temporary[0] = 0; 137 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 138 { 139 if( resourceItem.idName == pWindowInfo->childWindowInfos[i2]->image.path ) 131 140 { 141 lstrcpy( temporary, resourceItem.filepath.c_str() ); 132 142 break; 133 143 } 134 144 } 135 if(i3==projectInfo.resourceManager.bitmapResources.size()) temporary[0]=0;136 else lstrcpy(temporary,projectInfo.resourceManager.bitmapResources[i3].filepath.c_str());137 145 } 138 146 if(temporary[0]){ … … 155 163 156 164 //フォントハンドルを破棄 157 for(i2=0;i2< pWindowInfo->childWindowInfos.size();i2++){165 for(i2=0;i2<static_cast<int>(pWindowInfo->childWindowInfos.size());i2++){ 158 166 if(lphFont[i2]) DeleteObject(lphFont[i2]); 159 167 } … … 161 169 162 170 //イメージハンドルを破棄 163 for(i2=0;i2< pWindowInfo->childWindowInfos.size();i2++){171 for(i2=0;i2<static_cast<int>(pWindowInfo->childWindowInfos.size());i2++){ 164 172 if(lphImage[i2]){ 165 if((pWindowInfo->childWindowInfos[i2]-> style&0x000F)==SS_ICON)173 if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_ICON) 166 174 DestroyIcon((HICON)lphImage[i2]); 167 else if((pWindowInfo->childWindowInfos[i2]-> style&0x000F)==SS_BITMAP)175 else if((pWindowInfo->childWindowInfos[i2]->GetStyle()&0x000F)==SS_BITMAP) 168 176 DeleteObject(lphImage[i2]); 169 177 } … … 176 184 } 177 185 178 void SetSupportDlgData(int WndNum, const WindowInfo &windowInfo )186 void SetSupportDlgData(int WndNum, const ActiveBasic::PM::WindowInfo &windowInfo ) 179 187 { 180 188 //////////////////////////////////// … … 307 315 308 316 i=GetWndNum(GetParent(hwnd)); 309 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);317 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 310 318 311 319 for(i3=0;;i3++){ -
trunk/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp
r623 r624 360 360 SetPosCenter(hwnd); 361 361 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 362 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);362 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 363 363 sprintf(temporary,"h%s",pWindowInfo->GetName().c_str()); 364 364 sprintf(temp2,"%sProc",pWindowInfo->GetName().c_str()); … … 394 394 395 395 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 396 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);396 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 397 397 398 398 RAD_UNDOSTATE_NAME names,NoticeNames; … … 481 481 SetPosCenter(hwnd); 482 482 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 483 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);484 if(pWindowInfo-> ExStyle&WS_EX_TOPMOST) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOPMOST,BM_SETCHECK,BST_CHECKED,0);485 if(pWindowInfo-> ExStyle&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);486 if(pWindowInfo-> ExStyle&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);487 if(pWindowInfo-> ExStyle&WS_EX_TOOLWINDOW) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOOLWINDOW,BM_SETCHECK,BST_CHECKED,0);488 if(pWindowInfo-> ExStyle&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);489 if(pWindowInfo-> ExStyle&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);490 if(pWindowInfo-> ExStyle&WS_EX_NOPARENTNOTIFY) SendDlgItemMessage(hwnd,IDC_EXSTYLE_NOPARENTNOTIFY,BM_SETCHECK,BST_CHECKED,0);491 if(pWindowInfo-> ExStyle&WS_EX_CONTEXTHELP) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTEXTHELP,BM_SETCHECK,BST_CHECKED,0);492 if(pWindowInfo-> ExStyle&WS_EX_CONTROLPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTROLPARENT,BM_SETCHECK,BST_CHECKED,0);483 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 484 if(pWindowInfo->GetExStyle()&WS_EX_TOPMOST) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOPMOST,BM_SETCHECK,BST_CHECKED,0); 485 if(pWindowInfo->GetExStyle()&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0); 486 if(pWindowInfo->GetExStyle()&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0); 487 if(pWindowInfo->GetExStyle()&WS_EX_TOOLWINDOW) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TOOLWINDOW,BM_SETCHECK,BST_CHECKED,0); 488 if(pWindowInfo->GetExStyle()&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0); 489 if(pWindowInfo->GetExStyle()&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0); 490 if(pWindowInfo->GetExStyle()&WS_EX_NOPARENTNOTIFY) SendDlgItemMessage(hwnd,IDC_EXSTYLE_NOPARENTNOTIFY,BM_SETCHECK,BST_CHECKED,0); 491 if(pWindowInfo->GetExStyle()&WS_EX_CONTEXTHELP) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTEXTHELP,BM_SETCHECK,BST_CHECKED,0); 492 if(pWindowInfo->GetExStyle()&WS_EX_CONTROLPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTROLPARENT,BM_SETCHECK,BST_CHECKED,0); 493 493 break; 494 494 } … … 520 520 style|=WS_EX_CONTROLPARENT; 521 521 522 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);523 524 if(style==pWindowInfo-> ExStyle){522 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 523 524 if(style==pWindowInfo->GetExStyle()){ 525 525 SendMessage(hwnd,WM_COMMAND,IDCANCEL,0); 526 526 return 1; … … 528 528 529 529 //変更情報 530 Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,SELECT_WINDOW,pWindowInfo-> ExStyle);531 532 pWindowInfo-> ExStyle=style;530 Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,SELECT_WINDOW,pWindowInfo->GetExStyle()); 531 532 pWindowInfo->SetExStyle( style ); 533 533 EndDialog(hwnd,1); 534 534 return 1; … … 553 553 bInitial=1; 554 554 i=GetWndNum(GetParent(GetParent(hwnd))); 555 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);555 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 556 556 557 557 SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str()); 558 558 SetDlgItemText(hwnd,IDC_HANDLE,pWindowInfo->GetHandleName().c_str()); 559 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo-> caption);559 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str()); 560 560 561 561 //"3D FACE(標準)" … … 564 564 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_BGCOLOR2); 565 565 566 for(i3=0;i3<projectInfo.resourceManager.bitmapResources.size();i3++) 567 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)projectInfo.resourceManager.bitmapResources[i3].idName.c_str()); 566 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 567 { 568 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)resourceItem.idName.c_str()); 569 } 568 570 if(pWindowInfo->type==WNDTYPE_MODALDLG|| 569 571 pWindowInfo->type==WNDTYPE_MODELESSDLG){ … … 572 574 } 573 575 else{ 574 if(pWindowInfo-> bgColor==COLOR_3DFACE){576 if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE){ 575 577 //3DFACE 576 578 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,0,0); 577 579 } 578 else if(pWindowInfo-> bgColor<=0){580 else if(pWindowInfo->GetBackgroundColor()<=0){ 579 581 //色指定 580 582 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,1,0); 581 583 } 582 else if(pWindowInfo-> bgColor>=0x1000){584 else if(pWindowInfo->GetBackgroundColor()>=0x1000){ 583 585 //ビットマップ指定 584 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo-> bgColor-0x1000,0);586 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo->GetBackgroundColor()-0x1000,0); 585 587 } 586 588 } … … 595 597 596 598 for(i3=0,i4=0;i3<projectInfo.NumberOfMenu;i3++){ 597 if(pWindowInfo->MenuID){ 598 if(lstrcmpi(projectInfo.pMenuInfo[i3].IdName,pWindowInfo->MenuID)==0) 599 if( pWindowInfo->HasMenu() ) 600 { 601 if(lstrcmpi(projectInfo.pMenuInfo[i3].IdName,pWindowInfo->GetMenuIdName().c_str())==0) 599 602 i4=i3+1; 600 603 } 601 604 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,(long)projectInfo.pMenuInfo[i3].IdName); 602 605 } 603 if(i4==0&&pWindowInfo-> MenuID){606 if(i4==0&&pWindowInfo->HasMenu()){ 604 607 //メニューが存在しない場合、無効にする 605 HeapDefaultFree(pWindowInfo->MenuID); 606 pWindowInfo->MenuID=0; 608 pWindowInfo->SetMenuIdName( "" ); 607 609 DrawRadWindow(i,pWindowInfo); 608 610 } … … 617 619 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_ICONDEFAULT); 618 620 619 for(i3=0,i4=0;i3< projectInfo.resourceManager.iconResources.size();i3++){621 for(i3=0,i4=0;i3<static_cast<int>(projectInfo.resourceManager.iconResources.size());i3++){ 620 622 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(long)projectInfo.resourceManager.iconResources[i3].idName.c_str()); 621 623 622 if( pWindowInfo-> IconResName)624 if( pWindowInfo->HasIcon() ) 623 625 { 624 if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo-> IconResName)626 if( projectInfo.resourceManager.iconResources[i3].idName == pWindowInfo->GetIconResourceName() ) 625 627 { 626 628 i4=i3+1; … … 628 630 } 629 631 } 630 if(i4==0&&pWindowInfo->IconResName){ 632 if( i4 == 0 && pWindowInfo->HasIcon() ) 633 { 631 634 //アイコンが存在しない場合、無効にする 632 HeapDefaultFree(pWindowInfo->IconResName); 633 pWindowInfo->IconResName=0; 635 pWindowInfo->SetIconResourceName( "" ); 634 636 DrawRadWindow(i,pWindowInfo); 635 637 } … … 648 650 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,(long)STRING_WINDOWPROP_STYLE_CHILD); 649 651 650 if(pWindowInfo-> style&WS_POPUP) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,1,0);651 else if(pWindowInfo-> style&WS_CHILD) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,2,0);652 if(pWindowInfo->GetStyle()&WS_POPUP) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,1,0); 653 else if(pWindowInfo->GetStyle()&WS_CHILD) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,2,0); 652 654 else SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,0,0); 653 655 … … 660 662 661 663 //WS_CAPTION(WS_BORDER含む)を考慮してWS_THICKFRAMEを最初に比較する 662 if(pWindowInfo-> style&WS_THICKFRAME) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,2,0);663 else if(pWindowInfo-> style&WS_BORDER) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,1,0);664 if(pWindowInfo->GetStyle()&WS_THICKFRAME) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,2,0); 665 else if(pWindowInfo->GetStyle()&WS_BORDER) SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,1,0); 664 666 else SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_SETCURSEL,0,0); 665 667 666 if(pWindowInfo-> style&WS_CAPTION) SendDlgItemMessage(hwnd,IDC_STYLE_CAPTION,BM_SETCHECK,BST_CHECKED,0);667 if(pWindowInfo-> style&WS_SYSMENU) SendDlgItemMessage(hwnd,IDC_STYLE_SYSMENU,BM_SETCHECK,BST_CHECKED,0);668 if(pWindowInfo-> style&WS_MINIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZEBOX,BM_SETCHECK,BST_CHECKED,0);669 if(pWindowInfo-> style&WS_MAXIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZEBOX,BM_SETCHECK,BST_CHECKED,0);670 if(pWindowInfo-> style&WS_MINIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZE,BM_SETCHECK,BST_CHECKED,0);671 if(pWindowInfo-> style&WS_MAXIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZE,BM_SETCHECK,BST_CHECKED,0);672 if(pWindowInfo-> style&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLLBAR,BM_SETCHECK,BST_CHECKED,0);673 if(pWindowInfo-> style&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLLBAR,BM_SETCHECK,BST_CHECKED,0);674 if(pWindowInfo-> style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);675 if(pWindowInfo-> style&WS_CLIPSIBLINGS) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPSIBLINGS,BM_SETCHECK,BST_CHECKED,0);676 if(pWindowInfo-> style&WS_CLIPCHILDREN) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPCHILDREN,BM_SETCHECK,BST_CHECKED,0);677 if(pWindowInfo-> style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);668 if(pWindowInfo->GetStyle()&WS_CAPTION) SendDlgItemMessage(hwnd,IDC_STYLE_CAPTION,BM_SETCHECK,BST_CHECKED,0); 669 if(pWindowInfo->GetStyle()&WS_SYSMENU) SendDlgItemMessage(hwnd,IDC_STYLE_SYSMENU,BM_SETCHECK,BST_CHECKED,0); 670 if(pWindowInfo->GetStyle()&WS_MINIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZEBOX,BM_SETCHECK,BST_CHECKED,0); 671 if(pWindowInfo->GetStyle()&WS_MAXIMIZEBOX) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZEBOX,BM_SETCHECK,BST_CHECKED,0); 672 if(pWindowInfo->GetStyle()&WS_MINIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZE,BM_SETCHECK,BST_CHECKED,0); 673 if(pWindowInfo->GetStyle()&WS_MAXIMIZE) SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZE,BM_SETCHECK,BST_CHECKED,0); 674 if(pWindowInfo->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLLBAR,BM_SETCHECK,BST_CHECKED,0); 675 if(pWindowInfo->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLLBAR,BM_SETCHECK,BST_CHECKED,0); 676 if(pWindowInfo->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0); 677 if(pWindowInfo->GetStyle()&WS_CLIPSIBLINGS) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPSIBLINGS,BM_SETCHECK,BST_CHECKED,0); 678 if(pWindowInfo->GetStyle()&WS_CLIPCHILDREN) SendDlgItemMessage(hwnd,IDC_STYLE_CLIPCHILDREN,BM_SETCHECK,BST_CHECKED,0); 679 if(pWindowInfo->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0); 678 680 679 681 SetDlgItemText(hwnd,IDC_SETFONT,pWindowInfo->LogFont.lfFaceName); 680 682 681 RadProperty_Window_Window_StylingOrder(hwnd,&pWindowInfo->style); 683 DWORD tempStyle = pWindowInfo->GetStyle(); 684 RadProperty_Window_Window_StylingOrder(hwnd,&tempStyle); 685 pWindowInfo->SetStyle( tempStyle ); 682 686 683 687 … … 706 710 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,(DLGPROC)DlgRadProperty_Window_Rename)) return 1; 707 711 i=GetWndNum(GetParent(GetParent(hwnd))); 708 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);712 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 709 713 SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str()); 710 714 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; 716 720 i=GetWndNum(GetParent(GetParent(hwnd))); 717 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);718 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo-> caption);721 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 722 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str()); 719 723 return 1; 720 724 } … … 722 726 { 723 727 i=GetWndNum(GetParent(GetParent(hwnd))); 724 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);728 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 725 729 LOGFONT lf; 726 730 lf=pWindowInfo->LogFont; … … 737 741 if(HIWORD(wParam)==CBN_SELCHANGE){ 738 742 i=GetWndNum(GetParent(GetParent(hwnd))); 739 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);743 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 740 744 741 745 i3=SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_GETCURSEL,0,0); … … 744 748 745 749 //変更情報 746 Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo-> bgColor);747 748 pWindowInfo-> bgColor=COLOR_3DFACE;750 Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->GetBackgroundColor()); 751 752 pWindowInfo->SetBackgroundColor( COLOR_3DFACE ); 749 753 } 750 754 else if(i3==1){ … … 770 774 cc.lStructSize=sizeof(CHOOSECOLOR); 771 775 cc.hwndOwner=hwnd; 772 if(pWindowInfo-> bgColor<=0)773 cc.rgbResult=-pWindowInfo-> bgColor;776 if(pWindowInfo->GetBackgroundColor()<=0) 777 cc.rgbResult=-pWindowInfo->GetBackgroundColor(); 774 778 else cc.rgbResult=RGB(255,255,255); 775 779 cc.lpCustColors=CusColors; … … 777 781 if(!ChooseColor(&cc)){ 778 782 //キャンセル動作 779 if(pWindowInfo-> bgColor==COLOR_3DFACE){783 if(pWindowInfo->GetBackgroundColor()==COLOR_3DFACE){ 780 784 //3DFACE 781 785 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,0,0); 782 786 } 783 else if(pWindowInfo-> bgColor<=0){787 else if(pWindowInfo->GetBackgroundColor()<=0){ 784 788 //色指定 785 789 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,1,0); 786 790 } 787 else if(pWindowInfo-> bgColor>=0x1000){791 else if(pWindowInfo->GetBackgroundColor()>=0x1000){ 788 792 //ビットマップ指定 789 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo-> bgColor-0x1000,0);793 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,2+pWindowInfo->GetBackgroundColor()-0x1000,0); 790 794 } 791 795 return 1; … … 793 797 794 798 //変更情報 795 Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo-> bgColor);796 797 pWindowInfo-> bgColor=-(int)cc.rgbResult;799 Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->GetBackgroundColor()); 800 801 pWindowInfo->SetBackgroundColor( -(int)cc.rgbResult ); 798 802 } 799 803 else{ … … 802 806 803 807 //変更情報 804 Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo-> bgColor);805 806 pWindowInfo-> bgColor=0x1000+i3;808 Rad_NoticeChanging(i,RAD_UNDO_BGCOLOR,SELECT_WINDOW,pWindowInfo->GetBackgroundColor()); 809 810 pWindowInfo->SetBackgroundColor( 0x1000+i3 ); 807 811 } 808 812 DrawRadWindow(i,pWindowInfo); … … 813 817 if(HIWORD(wParam)==CBN_SELCHANGE){ 814 818 i=GetWndNum(GetParent(GetParent(hwnd))); 815 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);819 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 816 820 817 821 //変更情報 818 Rad_NoticeChanging(i,RAD_UNDO_WINDOWMENU,SELECT_WINDOW,( long)pWindowInfo->MenuID);822 Rad_NoticeChanging(i,RAD_UNDO_WINDOWMENU,SELECT_WINDOW,(DWORD)&pWindowInfo->GetMenuIdName()); 819 823 820 824 i3=SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETCURSEL,0,0); 821 if(pWindowInfo->MenuID) 822 HeapDefaultFree(pWindowInfo->MenuID); 823 if(i3==0) pWindowInfo->MenuID=0; 824 else{ 825 pWindowInfo->MenuID=(char *)HeapAlloc(hHeap,0,SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXTLEN,i3,0)+1); 826 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXT,i3,(long)pWindowInfo->MenuID); 825 826 if(i3==0) 827 { 828 pWindowInfo->SetMenuIdName( "" ); 829 } 830 else 831 { 832 char temporary[1024]; 833 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXT,i3,(long)temporary); 834 pWindowInfo->SetMenuIdName( temporary ); 827 835 } 828 836 DrawRadWindow(i,pWindowInfo); … … 833 841 if(HIWORD(wParam)==CBN_SELCHANGE){ 834 842 i=GetWndNum(GetParent(GetParent(hwnd))); 835 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);843 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 836 844 837 845 //変更情報 838 Rad_NoticeChanging(i,RAD_UNDO_ICONRES,SELECT_WINDOW,( long)pWindowInfo->IconResName);846 Rad_NoticeChanging(i,RAD_UNDO_ICONRES,SELECT_WINDOW,(DWORD)&pWindowInfo->GetIconResourceName()); 839 847 840 848 i3=SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETCURSEL,0,0); 841 if(pWindowInfo->IconResName) 842 HeapDefaultFree(pWindowInfo->IconResName); 843 if(i3==0) pWindowInfo->IconResName=0; 844 else{ 845 pWindowInfo->IconResName=(char *)HeapAlloc(hHeap,0,SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXTLEN,i3,0)+1); 846 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXT,i3,(long)pWindowInfo->IconResName); 849 if(i3==0) 850 { 851 pWindowInfo->SetIconResourceName( "" ); 852 } 853 else 854 { 855 char temporary[1024]; 856 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXT,i3,(long)temporary); 857 pWindowInfo->SetIconResourceName( temporary ); 847 858 } 848 859 DrawRadWindow(i,pWindowInfo); … … 854 865 if(HIWORD(wParam)==CBN_SELCHANGE){ 855 866 i=GetWndNum(GetParent(GetParent(hwnd))); 856 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);867 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 857 868 858 869 //変更情報 859 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);870 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 860 871 861 872 i3=SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_GETCURSEL,0,0); 862 pWindowInfo->style&=0x3FFFFFFF; 863 if(i3==1) pWindowInfo->style|=WS_POPUP; 864 else if(i3==2) pWindowInfo->style|=WS_CHILD; 865 RadProperty_Window_Window_StylingOrder(hwnd,&pWindowInfo->style); 873 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & 0x3FFFFFFF ); 874 if(i3==1) pWindowInfo->AddStyle( WS_POPUP ); 875 else if(i3==2) pWindowInfo->AddStyle( WS_CHILD ); 876 877 DWORD tempStyle = pWindowInfo->GetStyle(); 878 RadProperty_Window_Window_StylingOrder(hwnd,&tempStyle); 879 pWindowInfo->SetStyle( tempStyle ); 880 866 881 DrawRadWindow(i,pWindowInfo); 867 882 return 1; … … 871 886 if(HIWORD(wParam)==CBN_SELCHANGE){ 872 887 i=GetWndNum(GetParent(GetParent(hwnd))); 873 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);888 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 874 889 875 890 //変更情報 876 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);891 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 877 892 878 893 i3=SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_GETCURSEL,0,0); 879 pWindowInfo-> style&=~(WS_BORDER|WS_THICKFRAME);880 if(i3==1) pWindowInfo-> style|=WS_BORDER;894 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~(WS_BORDER|WS_THICKFRAME) ); 895 if(i3==1) pWindowInfo->AddStyle( WS_BORDER ); 881 896 else if(i3==2){ 882 pWindowInfo->style|=WS_BORDER; 883 pWindowInfo->style|=WS_THICKFRAME; 884 } 885 RadProperty_Window_Border_StylingOrder(hwnd,&pWindowInfo->style); 897 pWindowInfo->AddStyle( WS_BORDER ); 898 pWindowInfo->AddStyle( WS_THICKFRAME ); 899 } 900 DWORD tempStyle = pWindowInfo->GetStyle(); 901 RadProperty_Window_Border_StylingOrder(hwnd,&tempStyle); 902 pWindowInfo->SetStyle( tempStyle ); 903 886 904 DrawRadWindow(i,pWindowInfo); 887 905 return 1; … … 892 910 if(HIWORD(wParam)==BN_CLICKED){ 893 911 i=GetWndNum(GetParent(GetParent(hwnd))); 894 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);912 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 895 913 896 914 //変更情報 897 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);915 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 898 916 899 917 if(SendDlgItemMessage(hwnd,IDC_STYLE_CAPTION,BM_GETCHECK,0,0)) 900 pWindowInfo-> style|=WS_CAPTION;918 pWindowInfo->AddStyle( WS_CAPTION ); 901 919 else 902 pWindowInfo->style&=~WS_CAPTION; 903 RadProperty_Window_Caption_StylingOrder(hwnd,&pWindowInfo->style); 920 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_CAPTION ); 921 DWORD tempStyle = pWindowInfo->GetStyle(); 922 RadProperty_Window_Caption_StylingOrder(hwnd,&tempStyle); 923 pWindowInfo->SetStyle( tempStyle ); 904 924 DrawRadWindow(i,pWindowInfo); 905 925 return 1; … … 909 929 if(HIWORD(wParam)==BN_CLICKED){ 910 930 i=GetWndNum(GetParent(GetParent(hwnd))); 911 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);931 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 912 932 913 933 //変更情報 914 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);934 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 915 935 916 936 if(SendDlgItemMessage(hwnd,IDC_STYLE_SYSMENU,BM_GETCHECK,0,0)) 917 pWindowInfo-> style|=WS_SYSMENU;937 pWindowInfo->AddStyle( WS_SYSMENU ); 918 938 else 919 pWindowInfo-> style&=~WS_SYSMENU;939 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_SYSMENU ); 920 940 DrawRadWindow(i,pWindowInfo); 921 941 return 1; … … 925 945 if(HIWORD(wParam)==BN_CLICKED){ 926 946 i=GetWndNum(GetParent(GetParent(hwnd))); 927 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);947 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 928 948 929 949 //変更情報 930 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);950 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 931 951 932 952 if(SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZEBOX,BM_GETCHECK,0,0)) 933 pWindowInfo-> style|=WS_MINIMIZEBOX;953 pWindowInfo->AddStyle( WS_MINIMIZEBOX ); 934 954 else 935 pWindowInfo-> style&=~WS_MINIMIZEBOX;955 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MINIMIZEBOX ); 936 956 DrawRadWindow(i,pWindowInfo); 937 957 return 1; … … 941 961 if(HIWORD(wParam)==BN_CLICKED){ 942 962 i=GetWndNum(GetParent(GetParent(hwnd))); 943 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);963 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 944 964 945 965 //変更情報 946 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);966 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 947 967 948 968 if(SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZEBOX,BM_GETCHECK,0,0)) 949 pWindowInfo-> style|=WS_MAXIMIZEBOX;969 pWindowInfo->AddStyle( WS_MAXIMIZEBOX ); 950 970 else 951 pWindowInfo-> style&=~WS_MAXIMIZEBOX;971 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MAXIMIZEBOX ); 952 972 DrawRadWindow(i,pWindowInfo); 953 973 return 1; … … 957 977 if(HIWORD(wParam)==BN_CLICKED){ 958 978 i=GetWndNum(GetParent(GetParent(hwnd))); 959 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);979 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 960 980 961 981 //変更情報 962 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);982 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 963 983 964 984 if(SendDlgItemMessage(hwnd,IDC_STYLE_MINIMIZE,BM_GETCHECK,0,0)) 965 pWindowInfo-> style|=WS_MINIMIZE;985 pWindowInfo->AddStyle( WS_MINIMIZE ); 966 986 else 967 pWindowInfo-> style&=~WS_MINIMIZE;987 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MINIMIZE ); 968 988 DrawRadWindow(i,pWindowInfo); 969 989 return 1; … … 973 993 if(HIWORD(wParam)==BN_CLICKED){ 974 994 i=GetWndNum(GetParent(GetParent(hwnd))); 975 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);995 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 976 996 977 997 //変更情報 978 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);998 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 979 999 980 1000 if(SendDlgItemMessage(hwnd,IDC_STYLE_MAXIMIZE,BM_GETCHECK,0,0)) 981 pWindowInfo-> style|=WS_MAXIMIZE;1001 pWindowInfo->AddStyle( WS_MAXIMIZE ); 982 1002 else 983 pWindowInfo-> style&=~WS_MAXIMIZE;1003 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_MAXIMIZE ); 984 1004 DrawRadWindow(i,pWindowInfo); 985 1005 return 1; … … 988 1008 if(HIWORD(wParam)==BN_CLICKED){ 989 1009 i=GetWndNum(GetParent(GetParent(hwnd))); 990 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1010 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 991 1011 992 1012 //変更情報 993 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);1013 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 994 1014 995 1015 if(SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLLBAR,BM_GETCHECK,0,0)) 996 pWindowInfo-> style|=WS_HSCROLL;1016 pWindowInfo->AddStyle( WS_HSCROLL ); 997 1017 else 998 pWindowInfo-> style&=~WS_HSCROLL;1018 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_HSCROLL ); 999 1019 DrawRadWindow(i,pWindowInfo); 1000 1020 return 1; … … 1003 1023 if(HIWORD(wParam)==BN_CLICKED){ 1004 1024 i=GetWndNum(GetParent(GetParent(hwnd))); 1005 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1025 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1006 1026 1007 1027 //変更情報 1008 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);1028 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 1009 1029 1010 1030 if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLLBAR,BM_GETCHECK,0,0)) 1011 pWindowInfo-> style|=WS_VSCROLL;1031 pWindowInfo->AddStyle( WS_VSCROLL ); 1012 1032 else 1013 pWindowInfo-> style&=~WS_VSCROLL;1033 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_VSCROLL ); 1014 1034 DrawRadWindow(i,pWindowInfo); 1015 1035 return 1; … … 1019 1039 if(HIWORD(wParam)==BN_CLICKED){ 1020 1040 i=GetWndNum(GetParent(GetParent(hwnd))); 1021 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1041 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1022 1042 1023 1043 //変更情報 1024 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);1044 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 1025 1045 1026 1046 if(SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_GETCHECK,0,0)) 1027 pWindowInfo-> style|=WS_DISABLED;1047 pWindowInfo->AddStyle( WS_DISABLED ); 1028 1048 else 1029 pWindowInfo-> style&=~WS_DISABLED;1049 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_DISABLED ); 1030 1050 DrawRadWindow(i,pWindowInfo); 1031 1051 return 1; … … 1035 1055 if(HIWORD(wParam)==BN_CLICKED){ 1036 1056 i=GetWndNum(GetParent(GetParent(hwnd))); 1037 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1057 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1038 1058 1039 1059 //変更情報 1040 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);1060 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 1041 1061 1042 1062 if(SendDlgItemMessage(hwnd,IDC_STYLE_CLIPSIBLINGS,BM_GETCHECK,0,0)) 1043 pWindowInfo-> style|=WS_CLIPSIBLINGS;1063 pWindowInfo->AddStyle( WS_CLIPSIBLINGS ); 1044 1064 else 1045 pWindowInfo-> style&=~WS_CLIPSIBLINGS;1065 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_CLIPSIBLINGS ); 1046 1066 DrawRadWindow(i,pWindowInfo); 1047 1067 return 1; … … 1051 1071 if(HIWORD(wParam)==BN_CLICKED){ 1052 1072 i=GetWndNum(GetParent(GetParent(hwnd))); 1053 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1073 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1054 1074 1055 1075 //変更情報 1056 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);1076 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 1057 1077 1058 1078 if(SendDlgItemMessage(hwnd,IDC_STYLE_CLIPCHILDREN,BM_GETCHECK,0,0)) 1059 pWindowInfo-> style|=WS_CLIPCHILDREN;1079 pWindowInfo->AddStyle( WS_CLIPCHILDREN ); 1060 1080 else 1061 pWindowInfo-> style&=~WS_CLIPCHILDREN;1081 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_CLIPCHILDREN ); 1062 1082 DrawRadWindow(i,pWindowInfo); 1063 1083 return 1; … … 1067 1087 if(HIWORD(wParam)==BN_CLICKED){ 1068 1088 i=GetWndNum(GetParent(GetParent(hwnd))); 1069 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1089 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1070 1090 1071 1091 //変更情報 1072 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo-> style);1092 Rad_NoticeChanging(i,RAD_UNDO_STYLE,SELECT_WINDOW,pWindowInfo->GetStyle()); 1073 1093 1074 1094 if(SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_GETCHECK,0,0)) 1075 pWindowInfo-> style|=WS_VISIBLE;1095 pWindowInfo->AddStyle( WS_VISIBLE ); 1076 1096 else 1077 pWindowInfo-> style&=~WS_VISIBLE;1097 pWindowInfo->SetStyle( pWindowInfo->GetStyle() & ~WS_VISIBLE ); 1078 1098 DrawRadWindow(i,pWindowInfo); 1079 1099 return 1; … … 1092 1112 if(HIWORD(wParam)==BN_CLICKED){ 1093 1113 i=GetWndNum(GetParent(GetParent(hwnd))); 1094 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1114 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1095 1115 1096 1116 //変更情報 … … 1124 1144 SetPosCenter(hwnd); 1125 1145 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 1126 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1146 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1127 1147 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW) 1128 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo-> caption);1148 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->GetCaption().c_str()); 1129 1149 else 1130 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> caption);1150 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1131 1151 break; 1132 1152 } … … 1136 1156 { 1137 1157 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 1138 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1158 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1139 1159 1140 1160 i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_CAPTION))+1; … … 1142 1162 GetDlgItemText(hwnd,IDC_CAPTION,temporary,i3); 1143 1163 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){ 1144 if( lstrcmp(temporary,pWindowInfo->caption)==0){1164 if( pWindowInfo->GetCaption() == temporary){ 1145 1165 HeapDefaultFree(temporary); 1146 1166 SendMessage(hwnd,WM_COMMAND,IDCANCEL,0); … … 1149 1169 1150 1170 //変更情報を更新 1151 Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)pWindowInfo->caption); 1152 1153 HeapDefaultFree(pWindowInfo->caption); 1154 pWindowInfo->caption=temporary; 1171 Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->GetCaption()); 1172 1173 pWindowInfo->SetCaption( temporary ); 1155 1174 } 1156 1175 else{ 1157 if(lstrcmp(temporary,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption)==0){ 1176 if( pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption() == temporary ) 1177 { 1158 1178 HeapDefaultFree(temporary); 1159 1179 SendMessage(hwnd,WM_COMMAND,IDCANCEL,0); … … 1162 1182 1163 1183 //変更情報を更新 1164 Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption); 1165 1166 HeapDefaultFree(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption); 1167 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->caption=temporary; 1184 Rad_NoticeChanging(i,RAD_UNDO_CAPTION,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption()); 1185 1186 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetCaption( temporary ); 1168 1187 1169 1188 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC){ … … 1233 1252 DrawRadWindow(i,pWindowInfo); 1234 1253 EndDialog(hwnd,1); 1254 1255 HeapDefaultFree(temporary); 1235 1256 return 1; 1236 1257 } … … 1255 1276 SetPosCenter(hwnd); 1256 1277 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 1257 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1258 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1278 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1279 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1259 1280 } 1260 1281 break; … … 1264 1285 { 1265 1286 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 1266 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1287 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1267 1288 1268 1289 i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_IDNAME))+1; … … 1274 1295 temporary=(char *)HeapAlloc(hHeap,0,i3); 1275 1296 GetDlgItemText(hwnd,IDC_IDNAME,temporary,i3); 1276 if(lstrcmp(temporary,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName)==0){ 1297 if( pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName() == temporary ) 1298 { 1277 1299 HeapDefaultFree(temporary); 1278 1300 SendMessage(hwnd,WM_COMMAND,IDCANCEL,0); … … 1284 1306 1285 1307 //変更情報を更新 1286 Rad_NoticeChanging(i,RAD_UNDO_NAME,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName); 1287 1288 HeapDefaultFree(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName); 1289 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->IdName=temporary; 1308 Rad_NoticeChanging(i,RAD_UNDO_NAME,MdiInfo[i].MdiRadInfo->SelectingItem[0],(DWORD)&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName()); 1309 1310 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetName( temporary ); 1290 1311 1291 1312 EndDialog(hwnd,1); … … 1304 1325 extern MDIINFO MdiInfo[MAX_WNDNUM]; 1305 1326 1306 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];1327 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 1307 1328 1308 1329 switch(LOWORD(wParam)){ 1309 1330 case IDC_RENAMEID: 1310 1331 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd,(DLGPROC)DlgRadProperty_Item_RenameID)) return 1; 1311 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> IdName);1332 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1312 1333 return 1; 1313 1334 case IDC_RENAMECAPTION: 1314 1335 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1; 1315 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> caption);1336 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1316 1337 return 1; 1317 1338 case IDC_STYLE_DISABLED: 1318 1339 if(HIWORD(wParam)==BN_CLICKED){ 1319 1340 //変更情報 1320 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style);1341 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1321 1342 1322 1343 if(SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_GETCHECK,0,0)) 1323 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style|=WS_DISABLED;1344 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_DISABLED ); 1324 1345 else 1325 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style&=~WS_DISABLED;1346 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_DISABLED ); 1326 1347 DrawRadWindow(WndNum,pWindowInfo); 1327 1348 return 1; … … 1331 1352 if(HIWORD(wParam)==BN_CLICKED){ 1332 1353 //変更情報 1333 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style);1354 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1334 1355 1335 1356 if(SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_GETCHECK,0,0)) 1336 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style|=WS_VISIBLE;1357 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VISIBLE ); 1337 1358 else 1338 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style&=~WS_VISIBLE;1359 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VISIBLE ); 1339 1360 return 1; 1340 1361 } … … 1343 1364 if(HIWORD(wParam)==BN_CLICKED){ 1344 1365 //変更情報 1345 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style);1366 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1346 1367 1347 1368 if(SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_GETCHECK,0,0)) 1348 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style|=WS_GROUP;1369 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_GROUP ); 1349 1370 else 1350 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style&=~WS_GROUP;1371 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_GROUP ); 1351 1372 return 1; 1352 1373 } … … 1355 1376 if(HIWORD(wParam)==BN_CLICKED){ 1356 1377 //変更情報 1357 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style);1378 Rad_NoticeChanging(WndNum,RAD_UNDO_STYLE,MdiInfo[WndNum].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1358 1379 1359 1380 if(SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_GETCHECK,0,0)) 1360 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style|=WS_TABSTOP;1381 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_TABSTOP ); 1361 1382 else 1362 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]-> style&=~WS_TABSTOP;1383 pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_TABSTOP ); 1363 1384 return 1; 1364 1385 } … … 1376 1397 SetPosCenter(hwnd); 1377 1398 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 1378 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1379 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0);1380 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0);1381 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle&WS_EX_DLGMODALFRAME) SendDlgItemMessage(hwnd,IDC_EXSTYLE_DLGMODALFRAME,BM_SETCHECK,BST_CHECKED,0);1382 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0);1383 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0);1399 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1400 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_ACCEPTFILES) SendDlgItemMessage(hwnd,IDC_EXSTYLE_ACCEPTFILES,BM_SETCHECK,BST_CHECKED,0); 1401 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_TRANSPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_TRANSPARENT,BM_SETCHECK,BST_CHECKED,0); 1402 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_DLGMODALFRAME) SendDlgItemMessage(hwnd,IDC_EXSTYLE_DLGMODALFRAME,BM_SETCHECK,BST_CHECKED,0); 1403 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0); 1404 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0); 1384 1405 break; 1385 1406 } … … 1389 1410 { 1390 1411 i=GetWndNum(GetWindow(hClient,GW_CHILD)); 1391 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1412 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1392 1413 1393 1414 DWORD style; … … 1404 1425 style|=WS_EX_STATICEDGE; 1405 1426 1406 if(style==pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle){1427 if(style==pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()){ 1407 1428 SendMessage(hwnd,WM_COMMAND,IDCANCEL,0); 1408 1429 return 1; … … 1410 1431 1411 1432 //変更情報 1412 Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle);1413 1414 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ExStyle=style;1433 Rad_NoticeChanging(i,RAD_UNDO_EXSTYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetExStyle()); 1434 1435 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetExStyle( style ); 1415 1436 EndDialog(hwnd,1); 1416 1437 return 1; … … 1439 1460 bInitial=1; 1440 1461 i=GetWndNum(GetParent(GetParent(hwnd))); 1441 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1442 1443 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1444 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> caption);1462 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1463 1464 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1465 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1445 1466 1446 1467 … … 1448 1469 //スタイル 1449 1470 1450 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);1451 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);1452 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);1453 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);1454 1455 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_OWNERDRAW)==BS_OWNERDRAW) SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_CHECKED,0);1456 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_DEFPUSHBUTTON) SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_CHECKED,0);1457 1458 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);1459 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);1460 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);1461 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);1471 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0); 1472 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0); 1473 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0); 1474 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0); 1475 1476 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_OWNERDRAW)==BS_OWNERDRAW) SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_CHECKED,0); 1477 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_DEFPUSHBUTTON) SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_CHECKED,0); 1478 1479 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0); 1480 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0); 1481 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0); 1482 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0); 1462 1483 1463 1484 … … 1476 1497 1477 1498 //ビットを考慮してBS_CENTERを最初に比較する 1478 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);1479 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);1480 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);1499 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0); 1500 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0); 1501 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0); 1481 1502 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0); 1482 1503 … … 1496 1517 1497 1518 //ビットを考慮してBS_VCENTERを最初に比較する 1498 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);1499 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);1500 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);1519 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0); 1520 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0); 1521 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0); 1501 1522 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0); 1502 1523 … … 1510 1531 if(i==-1) return 1; 1511 1532 i2=GetWndInfoNum(MdiInfo[i].path); 1512 WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];1533 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2]; 1513 1534 1514 1535 //共通スタイル … … 1521 1542 if(HIWORD(wParam)==BN_CLICKED){ 1522 1543 //変更情報 1523 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1544 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1524 1545 1525 1546 if(SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_GETCHECK,0,0)){ 1526 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_OWNERDRAW;1527 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_DEFPUSHBUTTON;1547 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW ); 1548 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_DEFPUSHBUTTON ); 1528 1549 SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_SETCHECK,BST_UNCHECKED,0); 1529 1550 } 1530 1551 else 1531 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_DEFPUSHBUTTON;1552 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON ); 1532 1553 DrawRadWindow(i,pWindowInfo); 1533 1554 return 1; … … 1537 1558 if(HIWORD(wParam)==BN_CLICKED){ 1538 1559 //変更情報 1539 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1560 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1540 1561 1541 1562 if(SendDlgItemMessage(hwnd,IDC_BS_OWNERDRAW,BM_GETCHECK,0,0)){ 1542 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_DEFPUSHBUTTON;1543 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_OWNERDRAW;1563 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_DEFPUSHBUTTON ); 1564 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_OWNERDRAW ); 1544 1565 SendDlgItemMessage(hwnd,IDC_BS_DEFPUSHBUTTON,BM_SETCHECK,BST_UNCHECKED,0); 1545 1566 } 1546 1567 else 1547 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_OWNERDRAW;1568 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_OWNERDRAW ); 1548 1569 DrawRadWindow(i,pWindowInfo); 1549 1570 return 1; … … 1553 1574 if(HIWORD(wParam)==BN_CLICKED){ 1554 1575 //変更情報 1555 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1576 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1556 1577 1557 1578 if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){ 1558 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_ICON;1559 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_BITMAP;1579 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON ); 1580 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP ); 1560 1581 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0); 1561 1582 } 1562 1583 else 1563 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_ICON;1584 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON ); 1564 1585 DrawRadWindow(i,pWindowInfo); 1565 1586 return 1; … … 1569 1590 if(HIWORD(wParam)==BN_CLICKED){ 1570 1591 //変更情報 1571 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1592 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1572 1593 1573 1594 if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){ 1574 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_BITMAP;1575 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_ICON;1595 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP ); 1596 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON ); 1576 1597 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0); 1577 1598 } 1578 1599 else 1579 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_BITMAP;1600 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP ); 1580 1601 DrawRadWindow(i,pWindowInfo); 1581 1602 return 1; … … 1585 1606 if(HIWORD(wParam)==BN_CLICKED){ 1586 1607 //変更情報 1587 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1608 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1588 1609 1589 1610 if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0)) 1590 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_MULTILINE;1591 else 1592 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_MULTILINE;1611 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE ); 1612 else 1613 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE ); 1593 1614 DrawRadWindow(i,pWindowInfo); 1594 1615 return 1; … … 1598 1619 if(HIWORD(wParam)==BN_CLICKED){ 1599 1620 //変更情報 1600 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1621 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1601 1622 1602 1623 if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0)) 1603 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_NOTIFY;1604 else 1605 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_NOTIFY;1624 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY ); 1625 else 1626 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY ); 1606 1627 return 1; 1607 1628 } … … 1611 1632 if(HIWORD(wParam)==CBN_SELCHANGE){ 1612 1633 //変更情報 1613 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1634 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1614 1635 1615 1636 i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0); 1616 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~(BS_LEFT|BS_RIGHT|BS_CENTER);1617 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_LEFT;1618 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_RIGHT;1619 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_CENTER;1637 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER ); 1638 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT ); 1639 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT ); 1640 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER ); 1620 1641 DrawRadWindow(i,pWindowInfo); 1621 1642 return 1; … … 1625 1646 if(HIWORD(wParam)==CBN_SELCHANGE){ 1626 1647 //変更情報 1627 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1648 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1628 1649 1629 1650 i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0); 1630 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~(BS_TOP|BS_BOTTOM|BS_VCENTER);1631 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_TOP;1632 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_BOTTOM;1633 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_VCENTER;1651 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER ); 1652 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP ); 1653 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM ); 1654 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER ); 1634 1655 DrawRadWindow(i,pWindowInfo); 1635 1656 return 1; … … 1661 1682 bInitial=1; 1662 1683 i=GetWndNum(GetParent(GetParent(hwnd))); 1663 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1664 1665 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1666 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> caption);1684 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1685 1686 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1687 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1667 1688 1668 1689 … … 1670 1691 //スタイル 1671 1692 1672 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);1673 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);1674 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);1675 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);1676 1677 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_AUTOCHECKBOX)==BS_AUTOCHECKBOX) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0);1678 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_AUTO3STATE)==BS_AUTO3STATE){1693 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0); 1694 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0); 1695 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0); 1696 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0); 1697 1698 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTOCHECKBOX)==BS_AUTOCHECKBOX) SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0); 1699 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_AUTO3STATE)==BS_AUTO3STATE){ 1679 1700 SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_SETCHECK,BST_CHECKED,0); 1680 1701 SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0); 1681 1702 } 1682 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_3STATE)==BS_3STATE) SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0);1683 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0);1684 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0);1685 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);1686 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);1687 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0);1688 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);1703 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_3STATE)==BS_3STATE) SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_SETCHECK,BST_CHECKED,0); 1704 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_PUSHLIKE) SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_SETCHECK,BST_CHECKED,0); 1705 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFTTEXT) SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_SETCHECK,BST_CHECKED,0); 1706 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0); 1707 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0); 1708 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_MULTILINE) SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_SETCHECK,BST_CHECKED,0); 1709 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0); 1689 1710 1690 1711 … … 1703 1724 1704 1725 //ビットを考慮してBS_CENTERを最初に比較する 1705 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0);1706 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0);1707 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0);1726 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,3,0); 1727 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,1,0); 1728 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,2,0); 1708 1729 else SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_SETCURSEL,0,0); 1709 1730 … … 1723 1744 1724 1745 //ビットを考慮してBS_VCENTERを最初に比較する 1725 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0);1726 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0);1727 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0);1746 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_VCENTER)==BS_VCENTER) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,3,0); 1747 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_TOP) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,1,0); 1748 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BOTTOM) SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,2,0); 1728 1749 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0); 1729 1750 … … 1737 1758 if(i==-1) return 1; 1738 1759 i2=GetWndInfoNum(MdiInfo[i].path); 1739 WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];1760 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2]; 1740 1761 1741 1762 //共通スタイル … … 1748 1769 if(HIWORD(wParam)==BN_CLICKED){ 1749 1770 //変更情報 1750 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1771 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1751 1772 1752 1773 if(SendDlgItemMessage(hwnd,IDC_BS_AUTO,BM_GETCHECK,0,0)){ 1753 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x04){1774 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){ 1754 1775 //3state 1755 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1756 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_AUTO3STATE;1776 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1777 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE ); 1757 1778 } 1758 1779 else{ 1759 1780 //2state 1760 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1761 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_AUTOCHECKBOX;1781 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1782 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX ); 1762 1783 } 1763 1784 } 1764 1785 else{ 1765 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x04){1786 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x04){ 1766 1787 //3state 1767 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1768 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_3STATE;1788 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1789 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE ); 1769 1790 } 1770 1791 else{ 1771 1792 //2state 1772 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1773 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_CHECKBOX;1793 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1794 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX ); 1774 1795 } 1775 1796 } … … 1780 1801 if(HIWORD(wParam)==BN_CLICKED){ 1781 1802 //変更情報 1782 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1803 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1783 1804 1784 1805 if(SendDlgItemMessage(hwnd,IDC_BS_3STATE,BM_GETCHECK,0,0)){ 1785 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0F)==BS_CHECKBOX){1786 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1787 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_3STATE;1806 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_CHECKBOX){ 1807 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1808 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_3STATE ); 1788 1809 } 1789 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0F)==BS_AUTOCHECKBOX){1810 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTOCHECKBOX){ 1790 1811 //自動チェック 1791 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1792 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_AUTO3STATE;1812 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1813 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTO3STATE ); 1793 1814 } 1794 1815 } 1795 1816 else{ 1796 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0F)==BS_3STATE){1797 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1798 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_CHECKBOX;1817 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_3STATE){ 1818 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1819 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CHECKBOX ); 1799 1820 } 1800 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0F)==BS_AUTO3STATE){1821 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0F)==BS_AUTO3STATE){ 1801 1822 //自動チェック 1802 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=0xFFFFFFF0;1803 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_AUTOCHECKBOX;1823 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AndStyle( 0xFFFFFFF0 ); 1824 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_AUTOCHECKBOX ); 1804 1825 } 1805 1826 } … … 1810 1831 if(HIWORD(wParam)==BN_CLICKED){ 1811 1832 //変更情報 1812 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1833 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1813 1834 1814 1835 if(SendDlgItemMessage(hwnd,IDC_BS_PUSHLIKE,BM_GETCHECK,0,0)) 1815 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_PUSHLIKE;1816 else 1817 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_PUSHLIKE;1836 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_PUSHLIKE ); 1837 else 1838 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_PUSHLIKE ); 1818 1839 DrawRadWindow(i,pWindowInfo); 1819 1840 return 1; … … 1823 1844 if(HIWORD(wParam)==BN_CLICKED){ 1824 1845 //変更情報 1825 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1846 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1826 1847 1827 1848 if(SendDlgItemMessage(hwnd,IDC_BS_LEFTTEXT,BM_GETCHECK,0,0)) 1828 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_LEFTTEXT;1829 else 1830 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_LEFTTEXT;1849 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFTTEXT ); 1850 else 1851 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFTTEXT ); 1831 1852 DrawRadWindow(i,pWindowInfo); 1832 1853 return 1; … … 1836 1857 if(HIWORD(wParam)==BN_CLICKED){ 1837 1858 //変更情報 1838 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1859 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1839 1860 1840 1861 if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)){ 1841 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_ICON;1842 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_BITMAP;1862 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON ); 1863 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP ); 1843 1864 SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_UNCHECKED,0); 1844 1865 } 1845 1866 else 1846 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_ICON;1867 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON ); 1847 1868 DrawRadWindow(i,pWindowInfo); 1848 1869 return 1; … … 1852 1873 if(HIWORD(wParam)==BN_CLICKED){ 1853 1874 //変更情報 1854 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1875 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1855 1876 1856 1877 if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)){ 1857 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_BITMAP;1858 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_ICON;1878 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP ); 1879 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON ); 1859 1880 SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_UNCHECKED,0); 1860 1881 } 1861 1882 else 1862 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_BITMAP;1883 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP ); 1863 1884 DrawRadWindow(i,pWindowInfo); 1864 1885 return 1; … … 1868 1889 if(HIWORD(wParam)==BN_CLICKED){ 1869 1890 //変更情報 1870 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1891 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1871 1892 1872 1893 if(SendDlgItemMessage(hwnd,IDC_BS_MULTILINE,BM_GETCHECK,0,0)) 1873 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_MULTILINE;1874 else 1875 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_MULTILINE;1894 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_MULTILINE ); 1895 else 1896 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_MULTILINE ); 1876 1897 DrawRadWindow(i,pWindowInfo); 1877 1898 return 1; … … 1881 1902 if(HIWORD(wParam)==BN_CLICKED){ 1882 1903 //変更情報 1883 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1904 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1884 1905 1885 1906 if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0)) 1886 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_NOTIFY;1887 else 1888 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_NOTIFY;1907 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY ); 1908 else 1909 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY ); 1889 1910 return 1; 1890 1911 } … … 1894 1915 if(HIWORD(wParam)==CBN_SELCHANGE){ 1895 1916 //変更情報 1896 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1917 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1897 1918 1898 1919 i3=SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_GETCURSEL,0,0); 1899 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~(BS_LEFT|BS_RIGHT|BS_CENTER);1900 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_LEFT;1901 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_RIGHT;1902 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_CENTER;1920 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_LEFT|BS_RIGHT|BS_CENTER ); 1921 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT ); 1922 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT ); 1923 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER ); 1903 1924 DrawRadWindow(i,pWindowInfo); 1904 1925 return 1; … … 1908 1929 if(HIWORD(wParam)==CBN_SELCHANGE){ 1909 1930 //変更情報 1910 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);1931 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 1911 1932 1912 1933 i3=SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_GETCURSEL,0,0); 1913 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~(BS_TOP|BS_BOTTOM|BS_VCENTER);1914 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_TOP;1915 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_BOTTOM;1916 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_VCENTER;1934 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_TOP|BS_BOTTOM|BS_VCENTER ); 1935 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_TOP ); 1936 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BOTTOM ); 1937 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_VCENTER ); 1917 1938 DrawRadWindow(i,pWindowInfo); 1918 1939 return 1; … … 1952 1973 bInitial=1; 1953 1974 i=GetWndNum(GetParent(GetParent(hwnd))); 1954 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1955 1956 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1975 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1976 1977 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1957 1978 1958 1979 … … 1961 1982 //////////// 1962 1983 1963 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);1964 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);1965 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);1966 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);1984 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0); 1985 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0); 1986 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0); 1987 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0); 1967 1988 1968 1989 //////// … … 1978 1999 1979 2000 //ビットを考慮してCBS_DROPDOWNLISTを最初に比較する 1980 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&CBS_DROPDOWNLIST)==CBS_DROPDOWNLIST) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,2,0);1981 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&CBS_SIMPLE) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,0,0);1982 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&CBS_DROPDOWN) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,1,0);2001 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWNLIST)==CBS_DROPDOWNLIST) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,2,0); 2002 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SIMPLE) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,0,0); 2003 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DROPDOWN) SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_SETCURSEL,1,0); 1983 2004 1984 2005 … … 1994 2015 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_OWNERDRAW_VARIABLE); 1995 2016 1996 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&CBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,1,0);1997 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&CBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,2,0);2017 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,1,0); 2018 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWVARIABLE) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,2,0); 1998 2019 else SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,0,0); 1999 2020 2000 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0); 2001 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_SORT) SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_SETCHECK,BST_CHECKED,0); 2002 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_NOINTEGRALHEIGHT) SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_SETCHECK,BST_CHECKED,0); 2003 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0); 2004 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0); 2005 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0); 2006 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0); 2007 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_UPPERCASE) SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_SETCHECK,BST_CHECKED,0); 2008 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&CBS_LOWERCASE) SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_SETCHECK,BST_CHECKED,0); 2009 2010 RadProperty_ComboBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style); 2021 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_HASSTRINGS) SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_SETCHECK,BST_CHECKED,0); 2022 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_SORT) SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_SETCHECK,BST_CHECKED,0); 2023 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_NOINTEGRALHEIGHT) SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_SETCHECK,BST_CHECKED,0); 2024 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0); 2025 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0); 2026 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0); 2027 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_DISABLENOSCROLL) SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_SETCHECK,BST_CHECKED,0); 2028 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_UPPERCASE) SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_SETCHECK,BST_CHECKED,0); 2029 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_LOWERCASE) SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_SETCHECK,BST_CHECKED,0); 2030 2031 DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle(); 2032 RadProperty_ComboBox_StylingOrder(hwnd,&tempStyle); 2033 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 2011 2034 2012 2035 … … 2019 2042 if(i==-1) return 1; 2020 2043 i2=GetWndInfoNum(MdiInfo[i].path); 2021 WindowInfo *pWindowInfo = projectInfo.windowInfos[i2];2044 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[i2]; 2022 2045 2023 2046 //共通スタイル … … 2030 2053 if(HIWORD(wParam)==CBN_SELCHANGE){ 2031 2054 //変更情報 2032 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2055 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2033 2056 2034 2057 i3=SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_GETCURSEL,0,0); 2035 2058 //CBS_DROPDOWNLIST=CBS_SIMPLE | CBS_DROPDOWN 2036 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~(CBS_DROPDOWNLIST);2037 if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_SIMPLE;2038 else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_DROPDOWN;2039 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_DROPDOWNLIST;2059 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DROPDOWNLIST ); 2060 if(i3==0) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SIMPLE ); 2061 else if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWN ); 2062 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DROPDOWNLIST ); 2040 2063 2041 2064 DrawRadWindow(i,pWindowInfo); … … 2046 2069 if(HIWORD(wParam)==CBN_SELCHANGE){ 2047 2070 //変更情報 2048 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2071 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2049 2072 2050 2073 i3=SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_GETCURSEL,0,0); 2051 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~(CBS_OWNERDRAWFIXED|CBS_OWNERDRAWVARIABLE); 2052 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_OWNERDRAWFIXED; 2053 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=CBS_OWNERDRAWVARIABLE; 2054 2055 RadProperty_ComboBox_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style); 2074 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OWNERDRAWFIXED|CBS_OWNERDRAWVARIABLE ); 2075 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWFIXED ); 2076 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OWNERDRAWVARIABLE ); 2077 2078 DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle(); 2079 RadProperty_ComboBox_StylingOrder(hwnd,&tempStyle); 2080 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 2056 2081 return 1; 2057 2082 } … … 2061 2086 if(HIWORD(wParam)==BN_CLICKED){ 2062 2087 //変更情報 2063 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2088 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2064 2089 2065 2090 if(SendDlgItemMessage(hwnd,IDC_CBS_HASSTRINGS,BM_GETCHECK,0,0)) 2066 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_HASSTRINGS;2067 else 2068 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_HASSTRINGS;2091 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_HASSTRINGS ); 2092 else 2093 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_HASSTRINGS ); 2069 2094 return 1; 2070 2095 } … … 2073 2098 if(HIWORD(wParam)==BN_CLICKED){ 2074 2099 //変更情報 2075 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2100 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2076 2101 2077 2102 if(SendDlgItemMessage(hwnd,IDC_CBS_SORT,BM_GETCHECK,0,0)) 2078 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_SORT;2079 else 2080 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_SORT;2103 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_SORT ); 2104 else 2105 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_SORT ); 2081 2106 return 1; 2082 2107 } … … 2085 2110 if(HIWORD(wParam)==BN_CLICKED){ 2086 2111 //変更情報 2087 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2112 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2088 2113 2089 2114 if(SendDlgItemMessage(hwnd,IDC_CBS_NOINTEGRALHEIGHT,BM_GETCHECK,0,0)) 2090 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_NOINTEGRALHEIGHT;2091 else 2092 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_NOINTEGRALHEIGHT;2115 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_NOINTEGRALHEIGHT ); 2116 else 2117 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_NOINTEGRALHEIGHT ); 2093 2118 return 1; 2094 2119 } … … 2097 2122 if(HIWORD(wParam)==BN_CLICKED){ 2098 2123 //変更情報 2099 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2124 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2100 2125 2101 2126 if(SendDlgItemMessage(hwnd,IDC_CBS_OEMCONVERT,BM_GETCHECK,0,0)) 2102 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_OEMCONVERT;2103 else 2104 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_OEMCONVERT;2127 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_OEMCONVERT ); 2128 else 2129 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_OEMCONVERT ); 2105 2130 return 1; 2106 2131 } … … 2109 2134 if(HIWORD(wParam)==BN_CLICKED){ 2110 2135 //変更情報 2111 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2136 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2112 2137 2113 2138 if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0)) 2114 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=WS_VSCROLL;2115 else 2116 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~WS_VSCROLL;2139 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL ); 2140 else 2141 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL ); 2117 2142 DrawRadWindow(i,pWindowInfo); 2118 2143 return 1; … … 2122 2147 if(HIWORD(wParam)==BN_CLICKED){ 2123 2148 //変更情報 2124 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2149 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2125 2150 2126 2151 if(SendDlgItemMessage(hwnd,IDC_CBS_AUTOHSCROLL,BM_GETCHECK,0,0)) 2127 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_AUTOHSCROLL;2128 else 2129 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_AUTOHSCROLL;2152 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_AUTOHSCROLL ); 2153 else 2154 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_AUTOHSCROLL ); 2130 2155 return 1; 2131 2156 } … … 2134 2159 if(HIWORD(wParam)==BN_CLICKED){ 2135 2160 //変更情報 2136 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2161 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2137 2162 2138 2163 if(SendDlgItemMessage(hwnd,IDC_CBS_DISABLENOSCROLL,BM_GETCHECK,0,0)) 2139 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_DISABLENOSCROLL;2140 else 2141 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_DISABLENOSCROLL;2164 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_DISABLENOSCROLL ); 2165 else 2166 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_DISABLENOSCROLL ); 2142 2167 DrawRadWindow(i,pWindowInfo); 2143 2168 return 1; … … 2147 2172 if(HIWORD(wParam)==BN_CLICKED){ 2148 2173 //変更情報 2149 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2174 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2150 2175 2151 2176 if(SendDlgItemMessage(hwnd,IDC_CBS_UPPERCASE,BM_GETCHECK,0,0)) 2152 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_UPPERCASE;2153 else 2154 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_UPPERCASE;2177 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_UPPERCASE ); 2178 else 2179 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_UPPERCASE ); 2155 2180 return 1; 2156 2181 } … … 2159 2184 if(HIWORD(wParam)==BN_CLICKED){ 2160 2185 //変更情報 2161 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2186 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2162 2187 2163 2188 if(SendDlgItemMessage(hwnd,IDC_CBS_LOWERCASE,BM_GETCHECK,0,0)) 2164 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=CBS_LOWERCASE;2165 else 2166 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~CBS_LOWERCASE;2189 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( CBS_LOWERCASE ); 2190 else 2191 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( CBS_LOWERCASE ); 2167 2192 return 1; 2168 2193 } … … 2216 2241 bInitial=1; 2217 2242 i=GetWndNum(GetParent(GetParent(hwnd))); 2218 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);2219 2220 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);2221 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> caption);2243 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 2244 2245 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 2246 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 2222 2247 2223 2248 … … 2226 2251 //////////// 2227 2252 2228 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);2229 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);2230 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);2231 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);2232 2233 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_MULTILINE) SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_SETCHECK,BST_CHECKED,0);2234 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_NUMBER) SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_SETCHECK,BST_CHECKED,0);2235 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0);2236 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0);2237 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0);2238 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_AUTOVSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_SETCHECK,BST_CHECKED,0);2239 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_PASSWORD) SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_SETCHECK,BST_CHECKED,0);2240 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_NOHIDESEL) SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_SETCHECK,BST_CHECKED,0);2241 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0);2242 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_WANTRETURN) SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_SETCHECK,BST_CHECKED,0);2243 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_UPPERCASE) SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_CHECKED,0);2244 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_LOWERCASE) SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_CHECKED,0);2245 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_READONLY) SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_SETCHECK,BST_CHECKED,0);2253 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0); 2254 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0); 2255 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0); 2256 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0); 2257 2258 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_MULTILINE) SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_SETCHECK,BST_CHECKED,0); 2259 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NUMBER) SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_SETCHECK,BST_CHECKED,0); 2260 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_HSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_SETCHECK,BST_CHECKED,0); 2261 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOHSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_SETCHECK,BST_CHECKED,0); 2262 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VSCROLL) SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_SETCHECK,BST_CHECKED,0); 2263 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_AUTOVSCROLL) SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_SETCHECK,BST_CHECKED,0); 2264 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_PASSWORD) SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_SETCHECK,BST_CHECKED,0); 2265 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_NOHIDESEL) SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_SETCHECK,BST_CHECKED,0); 2266 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_OEMCONVERT) SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_SETCHECK,BST_CHECKED,0); 2267 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_WANTRETURN) SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_SETCHECK,BST_CHECKED,0); 2268 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_UPPERCASE) SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_CHECKED,0); 2269 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_LOWERCASE) SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_CHECKED,0); 2270 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_READONLY) SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_SETCHECK,BST_CHECKED,0); 2246 2271 2247 2272 … … 2258 2283 2259 2284 //ビットを考慮してES_LEFTを最後に検討する 2260 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_CENTER) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,1,0);2261 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&ES_RIGHT) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,2,0);2285 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_CENTER) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,1,0); 2286 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&ES_RIGHT) SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,2,0); 2262 2287 else SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_SETCURSEL,0,0); 2263 2288 2264 RadProperty_Edit_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style); 2289 DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle(); 2290 RadProperty_Edit_StylingOrder(hwnd,&tempStyle); 2291 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 2265 2292 2266 2293 … … 2273 2300 if(i==-1) return 1; 2274 2301 i2=GetWndInfoNum(MdiInfo[i].path); 2275 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);2302 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 2276 2303 2277 2304 //共通スタイル … … 2284 2311 if(HIWORD(wParam)==BN_CLICKED){ 2285 2312 //変更情報 2286 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2313 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2287 2314 2288 2315 if(SendDlgItemMessage(hwnd,IDC_ES_MULTILINE,BM_GETCHECK,0,0)) 2289 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style|=ES_MULTILINE; 2290 else 2291 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style&=~ES_MULTILINE; 2292 RadProperty_Edit_StylingOrder(hwnd,&pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->style); 2316 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_MULTILINE ); 2317 else 2318 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_MULTILINE ); 2319 2320 DWORD tempStyle = pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle(); 2321 RadProperty_Edit_StylingOrder(hwnd,&tempStyle); 2322 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 2293 2323 DrawRadWindow(i,pWindowInfo); 2294 2324 return 1; … … 2298 2328 if(HIWORD(wParam)==BN_CLICKED){ 2299 2329 //変更情報 2300 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2330 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2301 2331 2302 2332 if(SendDlgItemMessage(hwnd,IDC_ES_NUMBER,BM_GETCHECK,0,0)) 2303 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_NUMBER;2304 else 2305 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_NUMBER;2333 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NUMBER ); 2334 else 2335 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NUMBER ); 2306 2336 return 1; 2307 2337 } … … 2310 2340 if(HIWORD(wParam)==BN_CLICKED){ 2311 2341 //変更情報 2312 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2342 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2313 2343 2314 2344 if(SendDlgItemMessage(hwnd,IDC_STYLE_HSCROLL,BM_GETCHECK,0,0)) 2315 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=WS_HSCROLL;2316 else 2317 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~WS_HSCROLL;2345 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_HSCROLL ); 2346 else 2347 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_HSCROLL ); 2318 2348 DrawRadWindow(i,pWindowInfo); 2319 2349 return 1; … … 2323 2353 if(HIWORD(wParam)==BN_CLICKED){ 2324 2354 //変更情報 2325 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2355 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2326 2356 2327 2357 if(SendDlgItemMessage(hwnd,IDC_ES_AUTOHSCROLL,BM_GETCHECK,0,0)) 2328 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_AUTOHSCROLL;2329 else 2330 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_AUTOHSCROLL;2358 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOHSCROLL ); 2359 else 2360 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOHSCROLL ); 2331 2361 DrawRadWindow(i,pWindowInfo); 2332 2362 return 1; … … 2336 2366 if(HIWORD(wParam)==BN_CLICKED){ 2337 2367 //変更情報 2338 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2368 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2339 2369 2340 2370 if(SendDlgItemMessage(hwnd,IDC_STYLE_VSCROLL,BM_GETCHECK,0,0)) 2341 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=WS_VSCROLL;2342 else 2343 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~WS_VSCROLL;2371 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( WS_VSCROLL ); 2372 else 2373 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( WS_VSCROLL ); 2344 2374 DrawRadWindow(i,pWindowInfo); 2345 2375 return 1; … … 2349 2379 if(HIWORD(wParam)==BN_CLICKED){ 2350 2380 //変更情報 2351 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2381 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2352 2382 2353 2383 if(SendDlgItemMessage(hwnd,IDC_ES_AUTOVSCROLL,BM_GETCHECK,0,0)) 2354 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_AUTOVSCROLL;2355 else 2356 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_AUTOVSCROLL;2384 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_AUTOVSCROLL ); 2385 else 2386 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_AUTOVSCROLL ); 2357 2387 DrawRadWindow(i,pWindowInfo); 2358 2388 return 1; … … 2362 2392 if(HIWORD(wParam)==BN_CLICKED){ 2363 2393 //変更情報 2364 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2394 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2365 2395 2366 2396 if(SendDlgItemMessage(hwnd,IDC_ES_PASSWORD,BM_GETCHECK,0,0)) 2367 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_PASSWORD;2368 else 2369 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_PASSWORD;2397 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_PASSWORD ); 2398 else 2399 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_PASSWORD ); 2370 2400 DrawRadWindow(i,pWindowInfo); 2371 2401 return 1; … … 2375 2405 if(HIWORD(wParam)==BN_CLICKED){ 2376 2406 //変更情報 2377 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2407 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2378 2408 2379 2409 if(SendDlgItemMessage(hwnd,IDC_ES_NOHIDESEL,BM_GETCHECK,0,0)) 2380 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_NOHIDESEL;2381 else 2382 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_NOHIDESEL;2410 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_NOHIDESEL ); 2411 else 2412 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_NOHIDESEL ); 2383 2413 DrawRadWindow(i,pWindowInfo); 2384 2414 return 1; … … 2388 2418 if(HIWORD(wParam)==BN_CLICKED){ 2389 2419 //変更情報 2390 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2420 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2391 2421 2392 2422 if(SendDlgItemMessage(hwnd,IDC_ES_OEMCONVERT,BM_GETCHECK,0,0)) 2393 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_OEMCONVERT;2394 else 2395 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_OEMCONVERT;2423 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_OEMCONVERT ); 2424 else 2425 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_OEMCONVERT ); 2396 2426 DrawRadWindow(i,pWindowInfo); 2397 2427 return 1; … … 2401 2431 if(HIWORD(wParam)==BN_CLICKED){ 2402 2432 //変更情報 2403 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2433 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2404 2434 2405 2435 if(SendDlgItemMessage(hwnd,IDC_ES_WANTRETURN,BM_GETCHECK,0,0)) 2406 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_WANTRETURN;2407 else 2408 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_WANTRETURN;2436 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_WANTRETURN ); 2437 else 2438 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_WANTRETURN ); 2409 2439 DrawRadWindow(i,pWindowInfo); 2410 2440 return 1; … … 2414 2444 if(HIWORD(wParam)==BN_CLICKED){ 2415 2445 //変更情報 2416 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2446 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2417 2447 2418 2448 if(SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_GETCHECK,0,0)){ 2419 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_LOWERCASE;2420 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_UPPERCASE;2449 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE ); 2450 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_UPPERCASE ); 2421 2451 SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_SETCHECK,BST_UNCHECKED,0); 2422 2452 } 2423 2453 else 2424 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_UPPERCASE;2454 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE ); 2425 2455 DrawRadWindow(i,pWindowInfo); 2426 2456 return 1; … … 2430 2460 if(HIWORD(wParam)==BN_CLICKED){ 2431 2461 //変更情報 2432 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2462 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2433 2463 2434 2464 if(SendDlgItemMessage(hwnd,IDC_ES_LOWERCASE,BM_GETCHECK,0,0)){ 2435 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_UPPERCASE;2436 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_LOWERCASE;2465 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_UPPERCASE ); 2466 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_LOWERCASE ); 2437 2467 SendDlgItemMessage(hwnd,IDC_ES_UPPERCASE,BM_SETCHECK,BST_UNCHECKED,0); 2438 2468 } 2439 2469 else 2440 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_LOWERCASE;2470 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_LOWERCASE ); 2441 2471 DrawRadWindow(i,pWindowInfo); 2442 2472 return 1; … … 2446 2476 if(HIWORD(wParam)==BN_CLICKED){ 2447 2477 //変更情報 2448 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2478 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2449 2479 2450 2480 if(SendDlgItemMessage(hwnd,IDC_ES_READONLY,BM_GETCHECK,0,0)) 2451 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_READONLY;2452 else 2453 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~ES_READONLY;2481 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_READONLY ); 2482 else 2483 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_READONLY ); 2454 2484 DrawRadWindow(i,pWindowInfo); 2455 2485 return 1; … … 2460 2490 if(HIWORD(wParam)==CBN_SELCHANGE){ 2461 2491 //変更情報 2462 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2492 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2463 2493 2464 2494 i3=SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_GETCURSEL,0,0); 2465 2495 //ES_LEFT=0 2466 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~(ES_CENTER|ES_RIGHT);2467 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_CENTER;2468 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=ES_RIGHT;2496 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( ES_CENTER|ES_RIGHT ); 2497 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_CENTER ); 2498 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( ES_RIGHT ); 2469 2499 DrawRadWindow(i,pWindowInfo); 2470 2500 return 1; … … 2497 2527 bInitial=1; 2498 2528 i=GetWndNum(GetParent(GetParent(hwnd))); 2499 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);2500 2501 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);2502 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> caption);2529 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 2530 2531 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 2532 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 2503 2533 2504 2534 … … 2507 2537 //////////// 2508 2538 2509 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);2510 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);2511 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);2512 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);2539 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0); 2540 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0); 2541 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0); 2542 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0); 2513 2543 2514 2544 … … 2527 2557 2528 2558 //ビットを考慮してBS_CENTERを最初に検討する 2529 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,3,0);2530 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,1,0);2531 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,2,0);2559 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_CENTER)==BS_CENTER) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,3,0); 2560 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_LEFT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,1,0); 2561 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_RIGHT) SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,2,0); 2532 2562 else SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_SETCURSEL,0,0); 2533 2563 2534 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0);2535 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0);2536 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0);2564 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_ICON) SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_SETCHECK,BST_CHECKED,0); 2565 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_BITMAP) SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_SETCHECK,BST_CHECKED,0); 2566 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0); 2537 2567 2538 2568 … … 2545 2575 if(i==-1) return 1; 2546 2576 i2=GetWndInfoNum(MdiInfo[i].path); 2547 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);2577 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 2548 2578 2549 2579 //共通スタイル … … 2556 2586 if(HIWORD(wParam)==CBN_SELCHANGE){ 2557 2587 //変更情報 2558 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2588 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2559 2589 2560 2590 i3=SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_GETCURSEL,0,0); 2561 2591 //BS_CENTER=BS_LEFT | BS_RIGHT 2562 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~(BS_CENTER);2563 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_LEFT;2564 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_RIGHT;2565 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_CENTER;2592 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_CENTER ); 2593 if(i3==1) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_LEFT ); 2594 else if(i3==2) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_RIGHT ); 2595 else if(i3==3) pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_CENTER ); 2566 2596 DrawRadWindow(i,pWindowInfo); 2567 2597 return 1; … … 2572 2602 if(HIWORD(wParam)==BN_CLICKED){ 2573 2603 //変更情報 2574 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2604 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2575 2605 2576 2606 if(SendDlgItemMessage(hwnd,IDC_BS_ICON,BM_GETCHECK,0,0)) 2577 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_ICON;2578 else 2579 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_ICON;2607 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_ICON ); 2608 else 2609 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_ICON ); 2580 2610 DrawRadWindow(i,pWindowInfo); 2581 2611 return 1; … … 2585 2615 if(HIWORD(wParam)==BN_CLICKED){ 2586 2616 //変更情報 2587 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2617 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2588 2618 2589 2619 if(SendDlgItemMessage(hwnd,IDC_BS_BITMAP,BM_GETCHECK,0,0)) 2590 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_BITMAP;2591 else 2592 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_BITMAP;2620 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_BITMAP ); 2621 else 2622 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_BITMAP ); 2593 2623 DrawRadWindow(i,pWindowInfo); 2594 2624 return 1; … … 2598 2628 if(HIWORD(wParam)==BN_CLICKED){ 2599 2629 //変更情報 2600 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style);2630 Rad_NoticeChanging(i,RAD_UNDO_STYLE,MdiInfo[i].MdiRadInfo->SelectingItem[0],pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()); 2601 2631 2602 2632 if(SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_GETCHECK,0,0)) 2603 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style|=BS_NOTIFY;2604 else 2605 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&=~BS_NOTIFY;2633 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->AddStyle( BS_NOTIFY ); 2634 else 2635 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->DeleteStyle( BS_NOTIFY ); 2606 2636 return 1; 2607 2637 } … … 2650 2680 bInitial=1; 2651 2681 i=GetWndNum(GetParent(GetParent(hwnd))); 2652 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);2653 2654 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);2682 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 2683 2684 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 2655 2685 2656 2686 … … 2659 2689 //////////// 2660 2690 2661 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0);2662 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0);2663 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0);2664 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0);2691 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_DISABLED) SendDlgItemMessage(hwnd,IDC_STYLE_DISABLED,BM_SETCHECK,BST_CHECKED,0); 2692 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_VISIBLE) SendDlgItemMessage(hwnd,IDC_STYLE_VISIBLE,BM_SETCHECK,BST_CHECKED,0); 2693 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_GROUP) SendDlgItemMessage(hwnd,IDC_STYLE_GROUP,BM_SETCHECK,BST_CHECKED,0); 2694 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&WS_TABSTOP) SendDlgItemMessage(hwnd,IDC_STYLE_TABSTOP,BM_SETCHECK,BST_CHECKED,0); 2665 2695 2666 2696 ////////// … … 2687 2717 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(long)STRING_IMAGEBOXPROP_STYLE_BITMAP); 2688 2718 2689 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_BLACKFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,0,0);2690 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_GRAYFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,1,0);2691 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_WHITEFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,2,0);2692 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000001F)==SS_ETCHEDFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,3,0);2693 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_BLACKRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,4,0);2694 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_GRAYRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,5,0);2695 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_WHITERECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,6,0);2696 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_ICON||2697 (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_BITMAP){2698 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_ICON) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,7,0);2699 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> style&0x0000000F)==SS_BITMAP) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,8,0);2719 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,0,0); 2720 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,1,0); 2721 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITEFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,2,0); 2722 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000001F)==SS_ETCHEDFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,3,0); 2723 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,4,0); 2724 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_GRAYRECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,5,0); 2725 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_WHITERECT) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,6,0); 2726 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON|| 2727 (pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP){ 2728 if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_ICON) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,7,0); 2729 else if((pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BITMAP) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,8,0); 2700 2730 2701 2731 //リソース/ファイル スイッチチェックを表示 … … 2706 2736 ShowWindow(GetDlgItem(hwnd,IDC_IMAGE_SITUATION),SW_SHOW); 2707 2737 2708 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ImageCtrlInfo.type==IMGTYPE_FILE){2738 if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.IsFile()){ 2709 2739 //ファイル指定を表示 2710 2740 ShowWindow(GetDlgItem(hwnd,IDC_PATH),SW_SHOW); 2711 2741 ShowWindow(GetDlgItem(hwnd,IDC_CHANGEPATH),SW_SHOW); 2712 SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> ImageCtrlInfo.path);2742 SetDlgItemText(hwnd,IDC_PATH,pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->image.path.c_str()); 2713 2743 2714 2744 //イメージ状態テキスト … … 2718 2748 SendDlgItemMessage(hwnd,IDC_FILE,BM_SETCHECK,BST_CHECKED,0); 2719 2749 } 2720 &nbs