Changeset 828 in dev for trunk/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp
- Timestamp:
- Mar 19, 2012, 1:59:48 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to
/branches/egtra merged eligible
-
Property svn:mergeinfo
set to
-
trunk/ab5.0/abdev
-
Property svn:ignore
set to
*.opensdf
*.sdf
*.suo
*.user
int
ipch
out
-
Property svn:ignore
set to
-
trunk/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp
r763 r828 135 135 NULL, 136 136 BMPNUM_RADTOOLBAR, /*ビットマップの個数*/ 137 hResInst,(unsigned int)MAKEINTRESOURCE(IDR_CONTROL),CtrlToolBar, 137 nullptr, 138 reinterpret_cast<UINT_PTR>(ActiveBasic::Resource::LoadBitmapAlt(hResInst, IDR_CONTROL)), 139 CtrlToolBar, 138 140 (BMPNUM_RADTOOLBAR-1)+SEPNUM_RADTOOLBAR, /*アイテムの個数*/ 139 141 0,0,16,15,sizeof(TBBUTTON)); … … 211 213 switch(message){ 212 214 case WM_CREATE: 213 CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_CTRLBUTTONS),hwnd,(DLGPROC)RadToolButtonsProc);215 ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_CTRLBUTTONS, hwnd, RadToolButtonsProc); 214 216 return 0; 215 217 case WM_VSCROLL: … … 679 681 case IDC_RENAMEWINDOW: 680 682 { 681 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,DlgRadProperty_Window_Rename)) return 1; 683 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_WINDOW_RENAME, hwnd, DlgRadProperty_Window_Rename)) 684 { 685 return 1; 686 } 682 687 i=GetWndNum(GetParent(GetParent(hwnd))); 683 688 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path); … … 688 693 case IDC_RENAMECAPTION: 689 694 { 690 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,DlgRadProperty_Item_RenameCaption)) return 1; 695 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_RENAMECAPTION, hwnd, DlgRadProperty_Item_RenameCaption)) 696 { 697 return 1; 698 } 691 699 i=GetWndNum(GetParent(GetParent(hwnd))); 692 700 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path); … … 1073 1081 1074 1082 case IDC_EXSTYLE: 1075 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_EXSTYLE),hwnd,DlgRadProperty_Window_ExStyle)) return 1; 1083 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_WINDOW_EXSTYLE, hwnd, DlgRadProperty_Window_ExStyle)) 1084 { 1085 return 1; 1086 } 1076 1087 i=GetWndNum(GetParent(GetParent(hwnd))); 1077 1088 DrawRadWindow(i,GetWndInfo(MdiInfo[i]->path)); … … 1305 1316 switch(LOWORD(wParam)){ 1306 1317 case IDC_RENAMEID: 1307 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd,DlgRadProperty_Item_RenameID)) return 1; 1318 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_RENAMEID, hwnd, DlgRadProperty_Item_RenameID)) 1319 { 1320 return 1; 1321 } 1308 1322 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1309 1323 return 1; 1310 1324 case IDC_RENAMECAPTION: 1311 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,DlgRadProperty_Item_RenameCaption)) return 1; 1325 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_RENAMECAPTION, hwnd, DlgRadProperty_Item_RenameCaption)) 1326 { 1327 return 1; 1328 } 1312 1329 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1313 1330 return 1; … … 1634 1651 1635 1652 case IDC_EXSTYLE: 1636 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 1653 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 1654 { 1655 return 1; 1656 } 1637 1657 DrawRadWindow(i,pWindowInfo); 1638 1658 return 1; … … 1916 1936 1917 1937 case IDC_EXSTYLE: 1918 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 1938 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 1939 { 1940 return 1; 1941 } 1919 1942 DrawRadWindow(i,pWindowInfo); 1920 1943 return 1; … … 2168 2191 2169 2192 case IDC_EXSTYLE: 2170 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2193 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 2194 { 2195 return 1; 2196 } 2171 2197 DrawRadWindow(i,pWindowInfo); 2172 2198 return 1; … … 2475 2501 2476 2502 case IDC_EXSTYLE: 2477 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2503 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 2504 { 2505 return 1; 2506 } 2478 2507 DrawRadWindow(i,pWindowInfo); 2479 2508 return 1; … … 2610 2639 2611 2640 case IDC_EXSTYLE: 2612 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2641 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 2642 { 2643 return 1; 2644 } 2613 2645 DrawRadWindow(i,pWindowInfo); 2614 2646 return 1; … … 2962 2994 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.IsFile()){ 2963 2995 if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_ICON){ 2964 extern LPSTR IconFileFilter;2996 extern const LPCSTR IconFileFilter; 2965 2997 //"アイコン ファイルを指定して下さい" 2966 2998 if(!GetFilePathDialog(hwnd,temporary,IconFileFilter,STRING_IMAGEBOXPROP_GETPATH_ICON,1)) return 1; 2967 2999 } 2968 3000 else if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x000F)==SS_BITMAP){ 2969 extern LPSTR BitmapFileFilter;3001 extern const LPCSTR BitmapFileFilter; 2970 3002 //"ビットマップ ファイルを指定して下さい" 2971 3003 if(!GetFilePathDialog(hwnd,temporary,BitmapFileFilter,STRING_IMAGEBOXPROP_GETPATH_BITMAP,1)) return 1; … … 3023 3055 3024 3056 case IDC_EXSTYLE: 3025 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3057 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3058 { 3059 return 1; 3060 } 3026 3061 DrawRadWindow(i,pWindowInfo); 3027 3062 return 1; … … 3296 3331 3297 3332 case IDC_EXSTYLE: 3298 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3333 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3334 { 3335 return 1; 3336 } 3299 3337 DrawRadWindow(i,pWindowInfo); 3300 3338 return 1; … … 3571 3609 3572 3610 case IDC_EXSTYLE: 3573 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3611 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3612 { 3613 return 1; 3614 } 3574 3615 DrawRadWindow(i,pWindowInfo); 3575 3616 return 1; … … 3655 3696 3656 3697 case IDC_EXSTYLE: 3657 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3698 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3699 { 3700 return 1; 3701 } 3658 3702 DrawRadWindow(i,pWindowInfo); 3659 3703 return 1; … … 3887 3931 3888 3932 case IDC_EXSTYLE: 3889 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3933 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3934 { 3935 return 1; 3936 } 3890 3937 DrawRadWindow(i,pWindowInfo); 3891 3938 return 1; … … 3971 4018 3972 4019 case IDC_EXSTYLE: 3973 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4020 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4021 { 4022 return 1; 4023 } 3974 4024 DrawRadWindow(i,pWindowInfo); 3975 4025 return 1; … … 4102 4152 4103 4153 case IDC_EXSTYLE: 4104 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4154 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4155 { 4156 return 1; 4157 } 4105 4158 DrawRadWindow(i,pWindowInfo); 4106 4159 return 1; … … 4254 4307 4255 4308 case IDC_EXSTYLE: 4256 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4309 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4310 { 4311 return 1; 4312 } 4257 4313 DrawRadWindow(i,pWindowInfo); 4258 4314 return 1; … … 4465 4521 4466 4522 case IDC_EXSTYLE: 4467 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4523 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4524 { 4525 return 1; 4526 } 4468 4527 DrawRadWindow(i,pWindowInfo); 4469 4528 return 1; … … 4640 4699 4641 4700 case IDC_EXSTYLE: 4642 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4701 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4702 { 4703 return 1; 4704 } 4643 4705 DrawRadWindow(i,pWindowInfo); 4644 4706 return 1;
Note:
See TracChangeset
for help on using the changeset viewer.