- Timestamp:
- Jan 30, 2011, 10:45:09 PM (14 years ago)
- Location:
- branches/egtra/ab5.0/abdev
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp
r793 r794 170 170 } 171 171 172 INT_PTR DialogBoxAlt(HINSTANCE hinst, USHORT id, HWND hwndParent, DLGPROC dialogFunc, LPARAM initParam) 173 { 174 auto dlgTemplate = static_cast<DLGTEMPLATE*>(GetResource(hinst, id, RT_DIALOG)); 175 return ::DialogBoxIndirectParam(hinst, dlgTemplate, hwndParent, dialogFunc, initParam); 176 } 177 178 HWND CreateDialogAlt(HINSTANCE hinst, USHORT id, HWND hwndParent, DLGPROC dialogFunc, LPARAM initParam) 179 { 180 auto dlgTemplate = static_cast<DLGTEMPLATE*>(GetResource(hinst, id, RT_DIALOG)); 181 return ::CreateDialogIndirectParam(hinst, dlgTemplate, hwndParent, dialogFunc, initParam); 182 } 183 172 184 }} 173 -
branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.h
r793 r794 18 18 HMENU LoadMenuAlt(HINSTANCE hinst, USHORT id); 19 19 20 INT_PTR DialogBoxAlt(HINSTANCE hinst, USHORT id, HWND hwndParent, DLGPROC dialogFunc, LPARAM initParam = 0); 21 HWND CreateDialogAlt(HINSTANCE hinst, USHORT id, HWND hwndParent, DLGPROC dialogFunc, LPARAM initParam = 0); 22 20 23 struct IconDeleter 21 24 { -
branches/egtra/ab5.0/abdev/abdev/ExtensionLink.cpp
r717 r794 430 430 switch(LOWORD(wParam)){ 431 431 case IDC_ADD_BUTTON: 432 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd,(DLGPROC)DlgFileLinkAdd,0)) return 1; 432 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_EXTENSION_ADD, hwnd, DlgFileLinkAdd)) 433 { 434 return 1; 435 } 433 436 434 437 pobj_nv->pobj_ExtLink->ResetListView(GetDlgItem(hwnd,IDC_EXTENSION_LIST)); … … 445 448 if(i==ListView_GetItemCount(hListView)) return 1; 446 449 447 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd,(DLGPROC)DlgFileLinkAdd,(LPARAM)pobj_nv->pobj_ExtLink->ppobj_ExtItems[i])) return 1; 450 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_EXTENSION_ADD, hwnd, DlgFileLinkAdd,(LPARAM)pobj_nv->pobj_ExtLink->ppobj_ExtItems[i])) 451 { 452 return 1; 453 } 448 454 449 455 pobj_nv->pobj_ExtLink->ResetListView(GetDlgItem(hwnd,IDC_EXTENSION_LIST)); … … 516 522 pobj_nv->save(); 517 523 518 if(DialogBox(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_LINK),hwnd,(DLGPROC)DlgLinkFile)==0) return; 524 if (ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_EXTENSION_LINK, hwnd, DlgLinkFile)==0) 525 { 526 return; 527 } 519 528 520 529 char szApplicationPath[MAX_PATH]; -
branches/egtra/ab5.0/abdev/abdev/FileTree.cpp
r793 r794 124 124 break; 125 125 case IDM_FILETREE_PROPERTY: 126 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_FILEPROPERTY),hOwner,(DLGPROC)DlgProject_FileProperty);126 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PROJECT_FILEPROPERTY, hOwner, DlgProject_FileProperty); 127 127 break; 128 128 } -
branches/egtra/ab5.0/abdev/abdev/IconEditor.cpp
r772 r794 360 360 //ツールダイアログ部分を作成 361 361 HWND hToolDlg; 362 hToolDlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_TOOL),hChild,(DLGPROC)DlgIconToolProc);362 hToolDlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_ICONEDIT_TOOL, hChild, DlgIconToolProc); 363 363 364 364 //ツールダイアログのボタン部分を作成 365 365 HWND hButtonsDlg; 366 hButtonsDlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_BUTTONS),hToolDlg,(DLGPROC)DlgIconButtons);366 hButtonsDlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_ICONEDIT_BUTTONS, hToolDlg, DlgIconButtons); 367 367 368 368 //カラーテーブルダイアログ部分を作成 369 369 HWND hColorDlg; 370 hColorDlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_COLOR),hChild,(DLGPROC)DlgIconColorProc);370 hColorDlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_ICONEDIT_COLOR, hChild, DlgIconColorProc); 371 371 372 372 //ウィンドウのID登録 -
branches/egtra/ab5.0/abdev/abdev/IconEditor_Tool.cpp
r763 r794 55 55 56 56 hToolBar=CreateToolbarEx(hwnd,WS_CHILD|WS_VISIBLE|CCS_NODIVIDER|TBSTYLE_FLAT|TBSTYLE_TOOLTIPS, 57 NULL,57 0, 58 58 BMPNUM_ICONTOOLBAR, /*ビットマップの個数*/ 59 59 hResInst,(unsigned int)MAKEINTRESOURCE(IDR_ICONTOOLBAR),IconToolBar, … … 188 188 switch(LOWORD(wParam)){ 189 189 case IDC_ADD_ICONTYPE: 190 i =DialogBox(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_ICONTYPE),GetParent(hwnd),DlgIconType);190 i = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ICONEDIT_ICONTYPE, GetParent(hwnd), DlgIconType); 191 191 if(i==-1) return 1; 192 192 -
branches/egtra/ab5.0/abdev/abdev/MenuProc.cpp
r772 r794 73 73 MENU_INFO *MenuInfo; 74 74 75 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_MenuID_Input,0)) return; 75 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_MenuID_Input)) 76 { 77 return; 78 } 76 79 77 80 //重複チェック … … 265 268 266 269 MdiInfo[i]->MdiMenuInfo->hMenuEdit=hMenuEdit; 267 MdiInfo[i]->MdiMenuInfo->hEdit_Dlg =CreateDialog(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENUEDIT),hMenuEdit,(DLGPROC)MenuEditDlg);270 MdiInfo[i]->MdiMenuInfo->hEdit_Dlg = ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_PROJECT_MENUEDIT, hMenuEdit, MenuEditDlg); 268 271 269 272 SCROLLINFO ScrollInfo; … … 406 409 pMenuInfo=&pMenuInfo->pMenuInfo[i2]; 407 410 408 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENURENAME),hOwner,(DLGPROC)DlgMenuProperty_Rename,(long)pMenuInfo)) return 1; 411 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PROJECT_MENURENAME, hOwner, DlgMenuProperty_Rename, reinterpret_cast<LPARAM>(pMenuInfo))) 412 { 413 return 1; 414 } 409 415 GetDlgItemText(hwnd,IDC_IDNAME,temporary,MAX_PATH); 410 416 -
branches/egtra/ab5.0/abdev/abdev/Print.cpp
r793 r794 522 522 523 523 void Preview(void){ 524 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PREVIEW),hOwner,DlgPreview);524 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PREVIEW, hOwner, DlgPreview); 525 525 } 526 526 -
branches/egtra/ab5.0/abdev/abdev/ProjectControl.cpp
r793 r794 281 281 for(i=0;i<projectInfo.NumberOfMenu;i++){ 282 282 if(projectInfo.pMenuInfo[i].hTreeItem==hTreeItem){ 283 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_MenuID_Input,(long)projectInfo.pMenuInfo[i].IdName)) break; 283 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst,IDD_INPUTID, hOwner, DlgProject_MenuID_Input, reinterpret_cast<LPARAM>(projectInfo.pMenuInfo[i].IdName))) 284 { 285 break; 286 } 284 287 285 288 //重複チェック -
branches/egtra/ab5.0/abdev/abdev/RadProc.cpp
r772 r794 77 77 //サポートウィンドウを作成 78 78 HWND hSupport; 79 hSupport =CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_SUPPORT),hChild,(DLGPROC)DlgRadSupport);79 hSupport = ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_SUPPORT, hChild, DlgRadSupport); 80 80 81 81 //ウィンドウのID登録 … … 98 98 MdiInfo[i]->MdiRadInfo->hTools=hTools; 99 99 MdiInfo[i]->MdiRadInfo->hProperty=hProperty; 100 MdiInfo[i]->MdiRadInfo->hProp_Dlg =CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),hProperty,(DLGPROC)RadProperty_WindowProc);100 MdiInfo[i]->MdiRadInfo->hProp_Dlg = ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_WINDOW, hProperty, RadProperty_WindowProc); 101 101 102 102 SCROLLINFO ScrollInfo; … … 288 288 //プロパティウィンドウを設定 289 289 DestroyWindow(MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg); 290 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg =CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc);290 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg = ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_WINDOW, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_WindowProc); 291 291 292 292 SCROLLINFO ScrollInfo; … … 538 538 DestroyWindow(MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg); 539 539 if(MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){ 540 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg =CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc);540 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg = ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_WINDOW, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_WindowProc); 541 541 542 542 ScrollInfo.cbSize=sizeof(SCROLLINFO); … … 550 550 else{ 551 551 if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_BUTTON) 552 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_BUTTON),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ButtonProc);552 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_BUTTON, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ButtonProc); 553 553 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_CHECKBOX) 554 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_CHECKBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_CheckBoxProc);554 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_CHECKBOX, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_CheckBoxProc); 555 555 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_COMBOBOX) 556 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_COMBOBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ComboBoxProc);556 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_COMBOBOX, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ComboBoxProc); 557 557 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT) 558 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_EDIT),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_EditProc);558 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_EDIT, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_EditProc); 559 559 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_GROUPBOX) 560 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_GROUPBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_GroupBoxProc);560 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_GROUPBOX, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_GroupBoxProc); 561 561 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_HSCROLLBAR) 562 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc);562 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_SCROLLBAR, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ScrollBarProc); 563 563 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_IMAGEBOX) 564 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_IMAGEBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ImageBoxProc);564 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_IMAGEBOX, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ImageBoxProc); 565 565 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX) 566 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTBOX),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListBoxProc);566 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_LISTBOX, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ListBoxProc); 567 567 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_LISTVIEW) 568 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTVIEW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListViewProc);568 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_LISTVIEW, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ListViewProc); 569 569 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_PROGRESSBAR) 570 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_PROGRESSBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ProgressBarProc);570 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_PROGRESSBAR, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ProgressBarProc); 571 571 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_RADIOBUTTON) 572 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_RADIOBUTTON),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_RadioButtonProc);572 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_RADIOBUTTON, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_RadioButtonProc); 573 573 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_STATIC) 574 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_STATIC),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_StaticProc);574 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_STATIC, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_StaticProc); 575 575 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TRACKBAR) 576 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TRACKBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_TrackBarProc);576 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_TRACKBAR, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_TrackBarProc); 577 577 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_TREEVIEW) 578 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TREEVIEW),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_TreeViewProc);578 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_TREEVIEW, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_TreeViewProc); 579 579 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_UPDOWN) 580 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_UPDOWN),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_UpDownProc);580 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_UPDOWN, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_UpDownProc); 581 581 else if(pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->Control==CT_VSCROLLBAR) 582 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg= CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum]->MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc);582 MdiInfo[WndNum]->MdiRadInfo->hProp_Dlg=ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_RAD_PROP_SCROLLBAR, MdiInfo[WndNum]->MdiRadInfo->hProperty, RadProperty_ScrollBarProc); 583 583 584 584 ScrollInfo.cbSize=sizeof(SCROLLINFO); … … 1865 1865 case IDM_RAD_WINDOW_EVENTCODE: 1866 1866 i=GetWndNum(GetParent(hwnd)); 1867 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_RAD_EVENTCODE),hwnd,(DLGPROC)DlgEventCode,0);1867 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_EVENTCODE, hwnd, DlgEventCode, 0); 1868 1868 break; 1869 1869 case IDM_RAD_WINDOW_MENUEVENTCODE: 1870 1870 i=GetWndNum(GetParent(hwnd)); 1871 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_RAD_EVENTCODE),hwnd,(DLGPROC)DlgEventCode,1);1871 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_RAD_EVENTCODE, hwnd, DlgEventCode, 1); 1872 1872 break; 1873 1873 case IDM_RAD_ITEM_DELETE: -
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; -
branches/egtra/ab5.0/abdev/abdev/Resource.cpp
r629 r794 79 79 TVITEM tvItem; 80 80 81 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)projectInfo.resourceManager.cursorResources[CursorInfoNum].idName.c_str())) return; 81 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_ResourceID_Input, reinterpret_cast<LPARAM>(projectInfo.resourceManager.cursorResources[CursorInfoNum].idName.c_str()))) 82 { 83 return; 84 } 82 85 83 86 //重複チェック … … 186 189 TVITEM tvItem; 187 190 188 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)projectInfo.resourceManager.bitmapResources[BitmapInfoNum].idName.c_str())) return; 191 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_ResourceID_Input, reinterpret_cast<LPARAM>(projectInfo.resourceManager.bitmapResources[BitmapInfoNum].idName.c_str()))) 192 { 193 return; 194 } 189 195 190 196 //重複チェック … … 317 323 TVITEM tvItem; 318 324 319 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)projectInfo.resourceManager.iconResources[IconInfoNum].idName.c_str())) return; 325 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_INPUTID, hOwner, DlgProject_ResourceID_Input, reinterpret_cast<LPARAM>(projectInfo.resourceManager.iconResources[IconInfoNum].idName.c_str()))) 326 { 327 return; 328 } 320 329 321 330 //重複チェック -
branches/egtra/ab5.0/abdev/abdev/Search.cpp
r763 r794 298 298 else pobj_nv->bRegExp=0; 299 299 300 FindAllDlg =CreateDialog(hResInst,MAKEINTRESOURCE(IDD_FINDALL),GetWindow(hwnd,GW_OWNER),(DLGPROC)DlgFindAll);300 FindAllDlg = ActiveBasic::Resource::CreateDialogAlt(hResInst, IDD_FINDALL, GetWindow(hwnd, GW_OWNER), DlgFindAll); 301 301 ShowWindow(FindAllDlg,SW_SHOW); 302 302 -
branches/egtra/ab5.0/abdev/abdev/WindowControl.cpp
r700 r794 2172 2172 char temporary[MAX_PATH],temp2[1024]; 2173 2173 2174 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_NEWWINDOW),hOwner,(DLGPROC)DlgProject_NewWindow)) return; 2174 if (!ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PROJECT_NEWWINDOW, hOwner, DlgProject_NewWindow)) 2175 { 2176 return; 2177 } 2175 2178 2176 2179 //重複チェック -
branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp
r783 r794 978 978 char temporary[MAX_PATH]; 979 979 980 FileType =DialogBox(hResInst,MAKEINTRESOURCE(IDD_NEWFILE),hOwner,DlgNewFile);980 FileType = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_NEWFILE, hOwner, DlgNewFile); 981 981 if(FileType==-1) return; 982 982 … … 1369 1369 void MainFrame::OnCmdFind( UINT uNotifyCode, int nID, CWindow wndCtl ) 1370 1370 { 1371 DialogBox(hResInst,MAKEINTRESOURCE(IDD_FIND),m_hWnd,DlgFind);1371 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_FIND, m_hWnd, DlgFind); 1372 1372 } 1373 1373 1374 1374 void MainFrame::OnCmdPermutation( UINT uNotifyCode, int nID, CWindow wndCtl ) 1375 1375 { 1376 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),m_hWnd,DlgPermutation);1376 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PERMUTATION, m_hWnd, DlgPermutation); 1377 1377 } 1378 1378 … … 1629 1629 int idProcess; 1630 1630 DWORD dwPlatform; 1631 idProcess =DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_ATTACH),m_hWnd,DlgAttach,(LPARAM)&dwPlatform);1631 idProcess = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ATTACH, m_hWnd, DlgAttach, reinterpret_cast<LPARAM>(&dwPlatform)); 1632 1632 if(idProcess==0) return; 1633 1633 … … 1891 1891 void MainFrame::OnCmdAbout( UINT uNotifyCode, int nID, CWindow wndCtl ) 1892 1892 { 1893 DialogBox(hResInst,MAKEINTRESOURCE(IDD_ABOUT),m_hWnd,DialogAbout);1893 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ABOUT, m_hWnd, DialogAbout); 1894 1894 } 1895 1895
Note:
See TracChangeset
for help on using the changeset viewer.