Changeset 794 in dev for branches/egtra/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp
- Timestamp:
- Jan 30, 2011, 10:45:09 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/egtra/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp
r763 r794 211 211 switch(message){ 212 212 case WM_CREATE: 213 CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_CTRLBUTTONS),hwnd,(DLGPROC)RadToolButtonsProc);213 ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_CTRLBUTTONS, hwnd, RadToolButtonsProc); 214 214 return 0; 215 215 case WM_VSCROLL: … … 679 679 case IDC_RENAMEWINDOW: 680 680 { 681 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,DlgRadProperty_Window_Rename)) return 1; 681 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_WINDOW_RENAME, hwnd, DlgRadProperty_Window_Rename)) 682 { 683 return 1; 684 } 682 685 i=GetWndNum(GetParent(GetParent(hwnd))); 683 686 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path); … … 688 691 case IDC_RENAMECAPTION: 689 692 { 690 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,DlgRadProperty_Item_RenameCaption)) return 1; 693 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_RENAMECAPTION, hwnd, DlgRadProperty_Item_RenameCaption)) 694 { 695 return 1; 696 } 691 697 i=GetWndNum(GetParent(GetParent(hwnd))); 692 698 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path); … … 1073 1079 1074 1080 case IDC_EXSTYLE: 1075 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_EXSTYLE),hwnd,DlgRadProperty_Window_ExStyle)) return 1; 1081 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_WINDOW_EXSTYLE, hwnd, DlgRadProperty_Window_ExStyle)) 1082 { 1083 return 1; 1084 } 1076 1085 i=GetWndNum(GetParent(GetParent(hwnd))); 1077 1086 DrawRadWindow(i,GetWndInfo(MdiInfo[i]->path)); … … 1305 1314 switch(LOWORD(wParam)){ 1306 1315 case IDC_RENAMEID: 1307 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd,DlgRadProperty_Item_RenameID)) return 1; 1316 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_RENAMEID, hwnd, DlgRadProperty_Item_RenameID)) 1317 { 1318 return 1; 1319 } 1308 1320 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1309 1321 return 1; 1310 1322 case IDC_RENAMECAPTION: 1311 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,DlgRadProperty_Item_RenameCaption)) return 1; 1323 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_RENAMECAPTION, hwnd, DlgRadProperty_Item_RenameCaption)) 1324 { 1325 return 1; 1326 } 1312 1327 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1313 1328 return 1; … … 1634 1649 1635 1650 case IDC_EXSTYLE: 1636 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 1651 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 1652 { 1653 return 1; 1654 } 1637 1655 DrawRadWindow(i,pWindowInfo); 1638 1656 return 1; … … 1916 1934 1917 1935 case IDC_EXSTYLE: 1918 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 1936 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 1937 { 1938 return 1; 1939 } 1919 1940 DrawRadWindow(i,pWindowInfo); 1920 1941 return 1; … … 2168 2189 2169 2190 case IDC_EXSTYLE: 2170 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2191 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 2192 { 2193 return 1; 2194 } 2171 2195 DrawRadWindow(i,pWindowInfo); 2172 2196 return 1; … … 2475 2499 2476 2500 case IDC_EXSTYLE: 2477 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2501 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 2502 { 2503 return 1; 2504 } 2478 2505 DrawRadWindow(i,pWindowInfo); 2479 2506 return 1; … … 2610 2637 2611 2638 case IDC_EXSTYLE: 2612 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2639 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 2640 { 2641 return 1; 2642 } 2613 2643 DrawRadWindow(i,pWindowInfo); 2614 2644 return 1; … … 3023 3053 3024 3054 case IDC_EXSTYLE: 3025 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3055 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3056 { 3057 return 1; 3058 } 3026 3059 DrawRadWindow(i,pWindowInfo); 3027 3060 return 1; … … 3296 3329 3297 3330 case IDC_EXSTYLE: 3298 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3331 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3332 { 3333 return 1; 3334 } 3299 3335 DrawRadWindow(i,pWindowInfo); 3300 3336 return 1; … … 3571 3607 3572 3608 case IDC_EXSTYLE: 3573 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3609 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3610 { 3611 return 1; 3612 } 3574 3613 DrawRadWindow(i,pWindowInfo); 3575 3614 return 1; … … 3655 3694 3656 3695 case IDC_EXSTYLE: 3657 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3696 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3697 { 3698 return 1; 3699 } 3658 3700 DrawRadWindow(i,pWindowInfo); 3659 3701 return 1; … … 3887 3929 3888 3930 case IDC_EXSTYLE: 3889 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3931 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 3932 { 3933 return 1; 3934 } 3890 3935 DrawRadWindow(i,pWindowInfo); 3891 3936 return 1; … … 3971 4016 3972 4017 case IDC_EXSTYLE: 3973 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4018 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4019 { 4020 return 1; 4021 } 3974 4022 DrawRadWindow(i,pWindowInfo); 3975 4023 return 1; … … 4102 4150 4103 4151 case IDC_EXSTYLE: 4104 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4152 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4153 { 4154 return 1; 4155 } 4105 4156 DrawRadWindow(i,pWindowInfo); 4106 4157 return 1; … … 4254 4305 4255 4306 case IDC_EXSTYLE: 4256 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4307 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4308 { 4309 return 1; 4310 } 4257 4311 DrawRadWindow(i,pWindowInfo); 4258 4312 return 1; … … 4465 4519 4466 4520 case IDC_EXSTYLE: 4467 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4521 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4522 { 4523 return 1; 4524 } 4468 4525 DrawRadWindow(i,pWindowInfo); 4469 4526 return 1; … … 4640 4697 4641 4698 case IDC_EXSTYLE: 4642 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4699 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_PROP_ITEM_EXSTYLE, hwnd, DlgRadProperty_Item_ExStyle)) 4700 { 4701 return 1; 4702 } 4643 4703 DrawRadWindow(i,pWindowInfo); 4644 4704 return 1;
Note:
See TracChangeset
for help on using the changeset viewer.