Changeset 302 in dev for trunk/abdev/ProjectEditor
- Timestamp:
- Aug 24, 2007, 2:13:12 AM (17 years ago)
- Location:
- trunk/abdev/ProjectEditor
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abdev/ProjectEditor/ChildWndOnRebar.cpp
r22 r302 184 184 185 185 //サブクラス化 186 OldDocComboProc=(WNDPROC)GetWindowLong (hDocCombo,GWL_WNDPROC);187 SetWindowLong (hDocCombo,GWL_WNDPROC,(long)DocComboProc);186 OldDocComboProc=(WNDPROC)GetWindowLongPtr(hDocCombo,GWLP_WNDPROC); 187 SetWindowLongPtr(hDocCombo,GWLP_WNDPROC,(long)DocComboProc); 188 188 189 189 //フォントを設定 … … 250 250 //サブクラス化 251 251 extern WNDPROC OldStandardToolbarProc; 252 OldStandardToolbarProc=(WNDPROC)GetWindowLong (pobj_StandardToolbar->GetHandle(),GWL_WNDPROC);253 SetWindowLong (pobj_StandardToolbar->GetHandle(),GWL_WNDPROC,(long)StandardToolbarProc);252 OldStandardToolbarProc=(WNDPROC)GetWindowLongPtr(pobj_StandardToolbar->GetHandle(),GWLP_WNDPROC); 253 SetWindowLongPtr(pobj_StandardToolbar->GetHandle(),GWLP_WNDPROC,(long)StandardToolbarProc); 254 254 255 255 lpszText[0]=0; … … 295 295 //サブクラス化 296 296 extern WNDPROC OldStandardToolbarProc; 297 OldStandardToolbarProc=(WNDPROC)GetWindowLong (pobj_DebuggerToolbar->GetHandle(),GWL_WNDPROC);298 SetWindowLong (pobj_DebuggerToolbar->GetHandle(),GWL_WNDPROC,(long)StandardToolbarProc);297 OldStandardToolbarProc=(WNDPROC)GetWindowLongPtr(pobj_DebuggerToolbar->GetHandle(),GWLP_WNDPROC); 298 SetWindowLongPtr(pobj_DebuggerToolbar->GetHandle(),GWLP_WNDPROC,(long)StandardToolbarProc); 299 299 300 300 lpszText[0]=0; … … 334 334 //サブクラス化 335 335 extern WNDPROC OldStandardToolbarProc; 336 OldStandardToolbarProc=(WNDPROC)GetWindowLong (pobj_ReleaseToolbar->GetHandle(),GWL_WNDPROC);337 SetWindowLong (pobj_ReleaseToolbar->GetHandle(),GWL_WNDPROC,(long)StandardToolbarProc);336 OldStandardToolbarProc=(WNDPROC)GetWindowLongPtr(pobj_ReleaseToolbar->GetHandle(),GWLP_WNDPROC); 337 SetWindowLongPtr(pobj_ReleaseToolbar->GetHandle(),GWLP_WNDPROC,(long)StandardToolbarProc); 338 338 339 339 lpszText[0]=0; … … 356 356 //サブクラス化 357 357 extern WNDPROC OldSelectCompilerComboProc; 358 OldSelectCompilerComboProc=(WNDPROC)GetWindowLong (hSelectCompilerCombo,GWL_WNDPROC);359 SetWindowLong (hSelectCompilerCombo,GWL_WNDPROC,(long)SelectCompilerComboProc);358 OldSelectCompilerComboProc=(WNDPROC)GetWindowLongPtr(hSelectCompilerCombo,GWLP_WNDPROC); 359 SetWindowLongPtr(hSelectCompilerCombo,GWLP_WNDPROC,(long)SelectCompilerComboProc); 360 360 361 361 //フォントを設定 … … 384 384 //サブクラス化 385 385 extern WNDPROC OldWebSearchProc; 386 OldWebSearchProc=(WNDPROC)GetWindowLong (hWebSearchCombo,GWL_WNDPROC);387 SetWindowLong (hWebSearchCombo,GWL_WNDPROC,(long)WebSearchProc);386 OldWebSearchProc=(WNDPROC)GetWindowLongPtr(hWebSearchCombo,GWLP_WNDPROC); 387 SetWindowLongPtr(hWebSearchCombo,GWLP_WNDPROC,(long)WebSearchProc); 388 388 extern WNDPROC OldWebSearchEditProc; 389 OldWebSearchEditProc=(WNDPROC)GetWindowLong (GetWindow(hWebSearchCombo,GW_CHILD),GWL_WNDPROC);390 SetWindowLong (GetWindow(hWebSearchCombo,GW_CHILD),GWL_WNDPROC,(long)WebSearchEditProc);389 OldWebSearchEditProc=(WNDPROC)GetWindowLongPtr(GetWindow(hWebSearchCombo,GW_CHILD),GWLP_WNDPROC); 390 SetWindowLongPtr(GetWindow(hWebSearchCombo,GW_CHILD),GWLP_WNDPROC,(long)WebSearchEditProc); 391 391 392 392 //フォントを設定 -
trunk/abdev/ProjectEditor/Common.h
r130 r302 33 33 #include "BREGEXP.H" 34 34 #include "../BasicCompiler32/CommandValue.h" 35 #include "../ BasicCompiler_Common/BasicFixed.h"35 #include "../../jenga/include/smoothie/BasicFixed.h" 36 36 37 37 … … 66 66 #define APPLICATION_NAME "ActiveBasic 5.0" 67 67 #define VERSION_APPLI_NAME APPLICATION_NAME 68 #define VERSION_STRING "5.00.00 CP4(rev.265)"68 #define VERSION_STRING "5.00.00 (rev.299)" 69 69 70 70 #endif … … 106 106 107 107 #define GENERAL_SIZE 8192 108 #define VN_SIZE 512109 108 #define MAX_ARRAYDIM 16 110 109 -
trunk/abdev/ProjectEditor/Complement.cpp
r24 r302 479 479 else{ 480 480 //スクロールバーを使用しないようにする 481 i=GetWindowLong (ComplementWndInfo.hList,GWL_STYLE);481 i=GetWindowLongPtr(ComplementWndInfo.hList,GWL_STYLE); 482 482 i|=LVS_NOSCROLL; 483 483 i&=~(WS_VSCROLL|WS_HSCROLL); 484 SetWindowLong (ComplementWndInfo.hList,GWL_STYLE,i);484 SetWindowLongPtr(ComplementWndInfo.hList,GWL_STYLE,i); 485 485 } 486 486 … … 726 726 hwnd,NULL,hInst,0); 727 727 OldComplementListViewProc=(WNDPROC)GetWindowLongPtr(hListView,GWLP_WNDPROC); 728 SetWindowLong (hListView,GWLP_WNDPROC,(long)ComplementListViewProc);728 SetWindowLongPtr(hListView,GWLP_WNDPROC,(long)ComplementListViewProc); 729 729 730 730 //フォントをセット -
trunk/abdev/ProjectEditor/DialogBoxes.cpp
r119 r302 439 439 //"プロジェクト名の先頭文字はアルファベット(A~Z、a~z)またはアンダーバー(_)でなければなりません。" 440 440 MessageBox(hwnd,STRING_ERROR_PROJECTTOPCHAR,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION); 441 SetWindowLong (hwnd,DWL_MSGRESULT,-1);441 SetWindowLongPtr(hwnd,DWLP_MSGRESULT,-1); 442 442 return 1; 443 443 } … … 447 447 //"プロジェクト名に不正な文字コードが含まれています。" 448 448 MessageBox(hwnd,STRING_ERROR_PROJECTNAME,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION); 449 SetWindowLong (hwnd,DWL_MSGRESULT,-1);449 SetWindowLongPtr(hwnd,DWLP_MSGRESULT,-1); 450 450 return 1; 451 451 } … … 490 490 i=0; 491 491 psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE1); 492 psp.pfnDlgProc= DlgNewProject_Page1;492 psp.pfnDlgProc=(DLGPROC)DlgNewProject_Page1; 493 493 hpsp[i]=CreatePropertySheetPage(&psp); 494 494 i++; 495 495 psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE2); 496 psp.pfnDlgProc= DlgNewProject_Page2;496 psp.pfnDlgProc=(DLGPROC)DlgNewProject_Page2; 497 497 hpsp[i]=CreatePropertySheetPage(&psp); 498 498 i++; 499 499 psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE3); 500 psp.pfnDlgProc= DlgNewProject_Page3;500 psp.pfnDlgProc=(DLGPROC)DlgNewProject_Page3; 501 501 hpsp[i]=CreatePropertySheetPage(&psp); 502 502 … … 952 952 psp[i].hInstance=hResInst; 953 953 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION1); 954 psp[i].pfnDlgProc= DlgProjectOption_Whole;954 psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Whole; 955 955 hpsp[i]=CreatePropertySheetPage(&psp[i]); 956 956 i++; … … 959 959 psp[i].hInstance=hResInst; 960 960 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION2); 961 psp[i].pfnDlgProc= DlgProjectOption_Win32API;961 psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Win32API; 962 962 hpsp[i]=CreatePropertySheetPage(&psp[i]); 963 963 i++; … … 966 966 psp[i].hInstance=hResInst; 967 967 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION3); 968 psp[i].pfnDlgProc= DlgProjectOption_Manifest;968 psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Manifest; 969 969 hpsp[i]=CreatePropertySheetPage(&psp[i]); 970 970 i++; … … 973 973 psp[i].hInstance=hResInst; 974 974 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION4); 975 psp[i].pfnDlgProc= DlgProjectOption_Debug;975 psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Debug; 976 976 hpsp[i]=CreatePropertySheetPage(&psp[i]); 977 977 … … 1599 1599 #ifdef THETEXT 1600 1600 case IDC_SAVE: 1601 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_OPTION_THEME_SAVE),hwnd, DlgOptionThemeSave)) return 1;1601 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_OPTION_THEME_SAVE),hwnd,(DLGPROC)DlgOptionThemeSave)) return 1; 1602 1602 1603 1603 pobj_Theme=pobj_DBTheme->dupli_check(szNewThemeName); … … 2024 2024 switch(LOWORD(wParam)){ 2025 2025 case IDC_ADD: 2026 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd, Dlg_Option_Web_Domain_Add,-1)) return 1;2026 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,(DLGPROC)Dlg_Option_Web_Domain_Add,-1)) return 1; 2027 2027 2028 2028 pobj_temp_DBDomain->add(szDomainAdd_Name,szDomainAdd_Domain); … … 2047 2047 ListView_GetItemText(hListView,i,1,szDomainAdd_Domain,255); 2048 2048 lstrcpy(temporary,szDomainAdd_Name); 2049 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd, Dlg_Option_Web_Domain_Add,i)) return 1;2049 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,(DLGPROC)Dlg_Option_Web_Domain_Add,i)) return 1; 2050 2050 2051 2051 pobj_temp_DBDomain->change(temporary,szDomainAdd_Name,szDomainAdd_Domain); … … 2078 2078 ListView_GetItemText(nmhdr->hwndFrom,lpnmListView->iItem,1,szDomainAdd_Domain,255); 2079 2079 lstrcpy(szBeforeName,szDomainAdd_Name); 2080 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd, Dlg_Option_Web_Domain_Add,lpnmListView->iItem)) return 1;2080 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,(DLGPROC)Dlg_Option_Web_Domain_Add,lpnmListView->iItem)) return 1; 2081 2081 2082 2082 pobj_temp_DBDomain->change(szBeforeName,szDomainAdd_Name,szDomainAdd_Domain); … … 2108 2108 psp[i].hInstance=hResInst; 2109 2109 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_WHOLE); 2110 psp[i].pfnDlgProc= Dlg_Option_Whole;2110 psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Whole; 2111 2111 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2112 2112 i++; … … 2115 2115 psp[i].hInstance=hResInst; 2116 2116 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_EDITOR); 2117 psp[i].pfnDlgProc= Dlg_Option_Editor;2117 psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Editor; 2118 2118 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2119 2119 i++; … … 2122 2122 psp[i].hInstance=hResInst; 2123 2123 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_COLOR); 2124 psp[i].pfnDlgProc= Dlg_Option_Color;2124 psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Color; 2125 2125 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2126 2126 i++; … … 2129 2129 psp[i].hInstance=hResInst; 2130 2130 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_TOOLBAR); 2131 psp[i].pfnDlgProc= Dlg_Option_Toolbar;2131 psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Toolbar; 2132 2132 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2133 2133 … … 2139 2139 psp[i].hInstance=hResInst; 2140 2140 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_RAD); 2141 psp[i].pfnDlgProc= Dlg_Option_Rad;2141 psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Rad; 2142 2142 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2143 2143 #endif … … 2148 2148 psp[i].hInstance=hResInst; 2149 2149 psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_WEB); 2150 psp[i].pfnDlgProc= Dlg_Option_Web;2150 psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Web; 2151 2151 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2152 2152 -
trunk/abdev/ProjectEditor/ExtensionLink.cpp
r22 r302 425 425 switch(LOWORD(wParam)){ 426 426 case IDC_ADD_BUTTON: 427 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd, DlgFileLinkAdd,0)) return 1;427 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd,(DLGPROC)DlgFileLinkAdd,0)) return 1; 428 428 429 429 pobj_nv->pobj_ExtLink->ResetListView(GetDlgItem(hwnd,IDC_EXTENSION_LIST)); … … 440 440 if(i==ListView_GetItemCount(hListView)) return 1; 441 441 442 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd, DlgFileLinkAdd,(LPARAM)pobj_nv->pobj_ExtLink->ppobj_ExtItems[i])) return 1;442 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_ADD),hwnd,(DLGPROC)DlgFileLinkAdd,(LPARAM)pobj_nv->pobj_ExtLink->ppobj_ExtItems[i])) return 1; 443 443 444 444 pobj_nv->pobj_ExtLink->ResetListView(GetDlgItem(hwnd,IDC_EXTENSION_LIST)); … … 511 511 pobj_nv->save(); 512 512 513 if(DialogBox(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_LINK),hwnd, DlgLinkFile)==0) return;513 if(DialogBox(hResInst,MAKEINTRESOURCE(IDD_EXTENSION_LINK),hwnd,(DLGPROC)DlgLinkFile)==0) return; 514 514 515 515 char szApplicationPath[MAX_PATH]; -
trunk/abdev/ProjectEditor/FileTree.cpp
r3 r302 117 117 break; 118 118 case IDM_FILETREE_PROPERTY: 119 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_FILEPROPERTY),hOwner, DlgProject_FileProperty);119 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_FILEPROPERTY),hOwner,(DLGPROC)DlgProject_FileProperty); 120 120 break; 121 121 } … … 145 145 0,0,0,0, 146 146 hParent,0,hInst,0); 147 OldFileTreeViewProc=(WNDPROC)GetWindowLong (hTree,GWL_WNDPROC);148 SetWindowLong (hTree,GWL_WNDPROC,(long)FileTreeViewProc);147 OldFileTreeViewProc=(WNDPROC)GetWindowLongPtr(hTree,GWLP_WNDPROC); 148 SetWindowLongPtr(hTree,GWLP_WNDPROC,(long)FileTreeViewProc); 149 149 150 150 //イメージリスト読み込み、設定 -
trunk/abdev/ProjectEditor/MessageCallOperation.cpp
r24 r302 638 638 EnableWindow(GetDlgItem(hwnd,IDOK),0); 639 639 640 OldEventListViewProc=(WNDPROC)GetWindowLong (GetDlgItem(hwnd,IDC_EVENTLIST),GWL_WNDPROC);641 SetWindowLong (GetDlgItem(hwnd,IDC_EVENTLIST),GWL_WNDPROC,(long)EventListViewProc);640 OldEventListViewProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hwnd,IDC_EVENTLIST),GWLP_WNDPROC); 641 SetWindowLongPtr(GetDlgItem(hwnd,IDC_EVENTLIST),GWLP_WNDPROC,(long)EventListViewProc); 642 642 643 643 WndNum=GetWndNum(GetWindow(hClient,GW_CHILD)); -
trunk/abdev/ProjectEditor/Print.cpp
r24 r302 518 518 519 519 void Preview(void){ 520 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PREVIEW),hOwner, DlgPreview);520 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PREVIEW),hOwner,(DLGPROC)DlgPreview); 521 521 } 522 522 -
trunk/abdev/ProjectEditor/ProjectControl.cpp
r119 r302 277 277 for(i=0;i<ProjectInfo.NumberOfMenu;i++){ 278 278 if(ProjectInfo.pMenuInfo[i].hTreeItem==hTreeItem){ 279 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner, DlgProject_MenuID_Input,(long)ProjectInfo.pMenuInfo[i].IdName)) break;279 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_MenuID_Input,(long)ProjectInfo.pMenuInfo[i].IdName)) break; 280 280 281 281 //重複チェック … … 437 437 SendMessage(hButton,WM_SETFONT,(long)hStatusFont,0); 438 438 439 OldTabProc=(WNDPROC)GetWindowLong (hProjectViewTab,GWL_WNDPROC);440 SetWindowLong (hProjectViewTab,GWL_WNDPROC,(long)TabProc);439 OldTabProc=(WNDPROC)GetWindowLongPtr(hProjectViewTab,GWLP_WNDPROC); 440 SetWindowLongPtr(hProjectViewTab,GWLP_WNDPROC,(long)TabProc); 441 441 442 442 //タブを設定 … … 460 460 0,0,0,0, 461 461 hProjectViewTab,0,hInst,0); 462 OldProcedureTreeViewProc=(WNDPROC)GetWindowLong (hProcedureTreeView,GWL_WNDPROC);463 SetWindowLong (hProcedureTreeView,GWL_WNDPROC,(long)ProcedureTreeViewProc);462 OldProcedureTreeViewProc=(WNDPROC)GetWindowLongPtr(hProcedureTreeView,GWLP_WNDPROC); 463 SetWindowLongPtr(hProcedureTreeView,GWLP_WNDPROC,(long)ProcedureTreeViewProc); 464 464 //イメージリスト読み込み、設定 465 465 hProcedureTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,8,0); … … 479 479 0,0,0,0, 480 480 hProjectViewTab,0,hInst,0); 481 OldMaterialTreeViewProc=(WNDPROC)GetWindowLong (hMaterialTreeView,GWL_WNDPROC);482 SetWindowLong (hMaterialTreeView,GWL_WNDPROC,(long)MaterialTreeViewProc);481 OldMaterialTreeViewProc=(WNDPROC)GetWindowLongPtr(hMaterialTreeView,GWLP_WNDPROC); 482 SetWindowLongPtr(hMaterialTreeView,GWLP_WNDPROC,(long)MaterialTreeViewProc); 483 483 //イメージリスト読み込み、設定 484 484 hMaterialTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,3,0); … … 502 502 pobj_nv->bClipProjectView=1; 503 503 504 SetWindowLong (hwnd,GWL_EXSTYLE,WS_EX_STATICEDGE);504 SetWindowLongPtr(hwnd,GWL_EXSTYLE,WS_EX_STATICEDGE); 505 505 SetParent(hwnd,hOwner); 506 506 ResizeOwnerWnd(); … … 511 511 pobj_nv->bClipProjectView=0; 512 512 513 SetWindowLong (hwnd,GWL_EXSTYLE,0);513 SetWindowLongPtr(hwnd,GWL_EXSTYLE,0); 514 514 515 515 SetParent(hwnd,hProjectView_ToolWindow); -
trunk/abdev/ProjectEditor/ProjectEditor.cpp
r84 r302 977 977 char temporary[MAX_PATH]; 978 978 979 FileType=DialogBox(hResInst,MAKEINTRESOURCE(IDD_NEWFILE),hOwner, DlgNewFile);979 FileType=DialogBox(hResInst,MAKEINTRESOURCE(IDD_NEWFILE),hOwner,(DLGPROC)DlgNewFile); 980 980 if(FileType==-1) return; 981 981 … … 1635 1635 case IDM_CODE_SAVE: 1636 1636 //文字コードを指定して保存 1637 DialogBox(hResInst,MAKEINTRESOURCE(IDD_CODE_SAVE),hOwner, nkfDlgCodeSave);1637 DialogBox(hResInst,MAKEINTRESOURCE(IDD_CODE_SAVE),hOwner,(DLGPROC)nkfDlgCodeSave); 1638 1638 return 0; 1639 1639 case IDM_ALLSAVE: … … 1883 1883 return 0; 1884 1884 case IDM_FIND: 1885 DialogBox(hResInst,MAKEINTRESOURCE(IDD_FIND),hOwner, DlgFind);1885 DialogBox(hResInst,MAKEINTRESOURCE(IDD_FIND),hOwner,(DLGPROC)DlgFind); 1886 1886 return 0; 1887 1887 case IDM_PERMUTATION: 1888 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),hOwner, DlgPermutation);1888 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),hOwner,(DLGPROC)DlgPermutation); 1889 1889 return 0; 1890 1890 … … 1915 1915 /////////////////////// 1916 1916 case IDM_STRING_COUNT: 1917 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),hOwner, DlgStringCount,0);1917 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),hOwner,(DLGPROC)DlgStringCount,0); 1918 1918 return 0; 1919 1919 case IDM_SEL_STRING_COUNT: 1920 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),hOwner, DlgStringCount,1);1920 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),hOwner,(DLGPROC)DlgStringCount,1); 1921 1921 return 0; 1922 1922 #endif //THETEXT … … 2110 2110 int idProcess; 2111 2111 DWORD dwPlatform; 2112 idProcess=DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_ATTACH),hwnd, DlgAttach,(LPARAM)&dwPlatform);2112 idProcess=DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_ATTACH),hwnd,(DLGPROC)DlgAttach,(LPARAM)&dwPlatform); 2113 2113 if(idProcess==0) return 0; 2114 2114 … … 2343 2343 2344 2344 case IDM_ABOUT: 2345 DialogBox(hResInst,MAKEINTRESOURCE(IDD_ABOUT),hwnd, DialogAbout);2345 DialogBox(hResInst,MAKEINTRESOURCE(IDD_ABOUT),hwnd,(DLGPROC)DialogAbout); 2346 2346 return 0; 2347 2347 -
trunk/abdev/ProjectEditor/RadProc.cpp
r24 r302 78 78 //サポートウィンドウを作成 79 79 HWND hSupport; 80 hSupport=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_SUPPORT),hChild, DlgRadSupport);80 hSupport=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_SUPPORT),hChild,(DLGPROC)DlgRadSupport); 81 81 82 82 //ウィンドウのID登録 … … 100 100 MdiInfo[i].MdiRadInfo->hTools=hTools; 101 101 MdiInfo[i].MdiRadInfo->hProperty=hProperty; 102 MdiInfo[i].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),hProperty, RadProperty_WindowProc);102 MdiInfo[i].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),hProperty,(DLGPROC)RadProperty_WindowProc); 103 103 104 104 SCROLLINFO ScrollInfo; … … 289 289 //プロパティウィンドウを設定 290 290 DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg); 291 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum].MdiRadInfo->hProperty, RadProperty_WindowProc);291 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc); 292 292 293 293 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, RadProperty_WindowProc);540 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_WindowProc); 541 541 542 542 ScrollInfo.cbSize=sizeof(SCROLLINFO); … … 550 550 else{ 551 551 if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ButtonProc);552 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_BUTTON),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ButtonProc); 553 553 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_CheckBoxProc);554 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_CHECKBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_CheckBoxProc); 555 555 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ComboBoxProc);556 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_COMBOBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ComboBoxProc); 557 557 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_EditProc);558 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_EDIT),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_EditProc); 559 559 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_GroupBoxProc);560 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_GROUPBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_GroupBoxProc); 561 561 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ScrollBarProc);562 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc); 563 563 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ImageBoxProc);564 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_IMAGEBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ImageBoxProc); 565 565 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ListBoxProc);566 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTBOX),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListBoxProc); 567 567 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ListViewProc);568 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_LISTVIEW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ListViewProc); 569 569 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ProgressBarProc);570 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_PROGRESSBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ProgressBarProc); 571 571 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_RadioButtonProc);572 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_RADIOBUTTON),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_RadioButtonProc); 573 573 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_StaticProc);574 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_STATIC),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_StaticProc); 575 575 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_TrackBarProc);576 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TRACKBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_TrackBarProc); 577 577 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_TreeViewProc);578 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_TREEVIEW),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_TreeViewProc); 579 579 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_UpDownProc);580 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_UPDOWN),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_UpDownProc); 581 581 else if(ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[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, RadProperty_ScrollBarProc);582 MdiInfo[WndNum].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_SCROLLBAR),MdiInfo[WndNum].MdiRadInfo->hProperty,(DLGPROC)RadProperty_ScrollBarProc); 583 583 584 584 ScrollInfo.cbSize=sizeof(SCROLLINFO); … … 1622 1622 case IDM_RAD_WINDOW_EVENTCODE: 1623 1623 i=GetWndNum(GetParent(hwnd)); 1624 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_RAD_EVENTCODE),hwnd, DlgEventCode,0);1624 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_RAD_EVENTCODE),hwnd,(DLGPROC)DlgEventCode,0); 1625 1625 break; 1626 1626 case IDM_RAD_WINDOW_MENUEVENTCODE: 1627 1627 i=GetWndNum(GetParent(hwnd)); 1628 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_RAD_EVENTCODE),hwnd, DlgEventCode,1);1628 DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_RAD_EVENTCODE),hwnd,(DLGPROC)DlgEventCode,1); 1629 1629 break; 1630 1630 case IDM_RAD_ITEM_DELETE: -
trunk/abdev/ProjectEditor/RadToolsAndPropertyProc.cpp
r83 r302 693 693 switch(LOWORD(wParam)){ 694 694 case IDC_RENAMEWINDOW: 695 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd, DlgRadProperty_Window_Rename)) return 1;695 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,(DLGPROC)DlgRadProperty_Window_Rename)) return 1; 696 696 i=GetWndNum(GetParent(GetParent(hwnd))); 697 697 i2=GetWndInfoNum(MdiInfo[i].path); … … 700 700 return 1; 701 701 case IDC_RENAMECAPTION: 702 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd, DlgRadProperty_Item_RenameCaption)) return 1;702 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1; 703 703 i=GetWndNum(GetParent(GetParent(hwnd))); 704 704 i2=GetWndInfoNum(MdiInfo[i].path); … … 1066 1066 1067 1067 case IDC_EXSTYLE: 1068 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_EXSTYLE),hwnd, DlgRadProperty_Window_ExStyle)) return 1;1068 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Window_ExStyle)) return 1; 1069 1069 i=GetWndNum(GetParent(GetParent(hwnd))); 1070 1070 i2=GetWndInfoNum(MdiInfo[i].path); … … 1286 1286 switch(LOWORD(wParam)){ 1287 1287 case IDC_RENAMEID: 1288 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd, DlgRadProperty_Item_RenameID)) return 1;1288 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd,(DLGPROC)DlgRadProperty_Item_RenameID)) return 1; 1289 1289 SetDlgItemText(hwnd,IDC_IDNAME,ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].IdName); 1290 1290 return 1; 1291 1291 case IDC_RENAMECAPTION: 1292 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd, DlgRadProperty_Item_RenameCaption)) return 1;1292 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,(DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1; 1293 1293 SetDlgItemText(hwnd,IDC_CAPTION,ProjectInfo.pWindowInfo[WndInfoNum].pChildInfo[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]].caption); 1294 1294 return 1; … … 1611 1611 1612 1612 case IDC_EXSTYLE: 1613 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;1613 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 1614 1614 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 1615 1615 return 1; … … 1891 1891 1892 1892 case IDC_EXSTYLE: 1893 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;1893 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 1894 1894 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 1895 1895 return 1; … … 2137 2137 2138 2138 case IDC_EXSTYLE: 2139 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;2139 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 2140 2140 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 2141 2141 return 1; … … 2437 2437 2438 2438 case IDC_EXSTYLE: 2439 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;2439 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 2440 2440 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 2441 2441 return 1; … … 2570 2570 2571 2571 case IDC_EXSTYLE: 2572 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;2572 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 2573 2573 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 2574 2574 return 1; … … 2966 2966 2967 2967 case IDC_EXSTYLE: 2968 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;2968 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 2969 2969 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 2970 2970 return 1; … … 3237 3237 3238 3238 case IDC_EXSTYLE: 3239 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;3239 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 3240 3240 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 3241 3241 return 1; … … 3506 3506 3507 3507 case IDC_EXSTYLE: 3508 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;3508 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 3509 3509 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 3510 3510 return 1; … … 3588 3588 3589 3589 case IDC_EXSTYLE: 3590 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;3590 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 3591 3591 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 3592 3592 return 1; … … 3818 3818 3819 3819 case IDC_EXSTYLE: 3820 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;3820 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 3821 3821 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 3822 3822 return 1; … … 3900 3900 3901 3901 case IDC_EXSTYLE: 3902 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;3902 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 3903 3903 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 3904 3904 return 1; … … 4029 4029 4030 4030 case IDC_EXSTYLE: 4031 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;4031 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 4032 4032 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 4033 4033 return 1; … … 4179 4179 4180 4180 case IDC_EXSTYLE: 4181 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;4181 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 4182 4182 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 4183 4183 return 1; … … 4388 4388 4389 4389 case IDC_EXSTYLE: 4390 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;4390 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 4391 4391 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 4392 4392 return 1; … … 4561 4561 4562 4562 case IDC_EXSTYLE: 4563 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, DlgRadProperty_Item_ExStyle)) return 1;4563 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,(DLGPROC)DlgRadProperty_Item_ExStyle)) return 1; 4564 4564 DrawRadWindow(i,&ProjectInfo.pWindowInfo[i2]); 4565 4565 return 1; -
trunk/abdev/ProjectEditor/Resource.cpp
r3 r302 208 208 TVITEM tvItem; 209 209 210 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner, DlgProject_ResourceID_Input,(long)ProjectInfo.res.pCursorResInfo[CursorInfoNum].IdName)) return;210 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)ProjectInfo.res.pCursorResInfo[CursorInfoNum].IdName)) return; 211 211 212 212 //重複チェック … … 326 326 TVITEM tvItem; 327 327 328 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner, DlgProject_ResourceID_Input,(long)ProjectInfo.res.pBitmapResInfo[BitmapInfoNum].IdName)) return;328 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)ProjectInfo.res.pBitmapResInfo[BitmapInfoNum].IdName)) return; 329 329 330 330 //重複チェック … … 465 465 TVITEM tvItem; 466 466 467 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner, DlgProject_ResourceID_Input,(long)ProjectInfo.res.pIconResInfo[IconInfoNum].IdName)) return;467 if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_ResourceID_Input,(long)ProjectInfo.res.pIconResInfo[IconInfoNum].IdName)) return; 468 468 469 469 //重複チェック -
trunk/abdev/ProjectEditor/Ruler.cpp
r24 r302 5 5 case WM_PAINT: 6 6 CRuler *pobj_Ruler; 7 pobj_Ruler=(CRuler *)GetWindowLong (hwnd,GWL_USERDATA);7 pobj_Ruler=(CRuler *)GetWindowLongPtr(hwnd,GWLP_USERDATA); 8 8 9 9 HDC hdc; … … 26 26 0,0,0,0, 27 27 hParent,0,hInst,0); 28 SetWindowLong (hRulerWnd,GWL_USERDATA,(long)this);28 SetWindowLongPtr(hRulerWnd,GWLP_USERDATA,(long)this); 29 29 30 30 HDC hdc; -
trunk/abdev/ProjectEditor/SubOperation.cpp
r120 r302 1433 1433 hwnd,0,hInst,0); 1434 1434 if(pobj_nv->bClipProjectView==0){ 1435 SetWindowLong (hProjectView,GWL_EXSTYLE,0);1435 SetWindowLongPtr(hProjectView,GWL_EXSTYLE,0); 1436 1436 SetParent(hProjectView,hProjectView_ToolWindow); 1437 1437 ResizeProjectView_ToolWindow(); -
trunk/abdev/ProjectEditor/TabCtrl.cpp
r25 r302 146 146 147 147 //サブクラス化 148 OldMainTabWndProc=(WNDPROC)GetWindowLong (hTab,GWL_WNDPROC);149 SetWindowLong (hTab,GWL_WNDPROC,(LONG_PTR)MainTabWndProc);148 OldMainTabWndProc=(WNDPROC)GetWindowLongPtr(hTab,GWLP_WNDPROC); 149 SetWindowLongPtr(hTab,GWLP_WNDPROC,(LONG_PTR)MainTabWndProc); 150 150 151 151 //ボールド体フォントを生成 -
trunk/abdev/ProjectEditor/TextEditor_EventProc.cpp
r24 r302 261 261 MdiInfo[wParam].pMdiTextEdit->pobj_WebResult->hwnd,0,hInst,0); 262 262 263 SetWindowLong (hOneTabWnd,GWL_USERDATA,(long)lParam);263 SetWindowLongPtr(hOneTabWnd,GWLP_USERDATA,(long)lParam); 264 264 265 265 return (LRESULT)hOneTabWnd; -
trunk/abdev/ProjectEditor/WebSearch.cpp
r83 r302 18 18 case WM_TIMER: 19 19 if(wParam==ID_TIMER_POPUP_ANIMATION){ 20 pobj_ResultList=(CResultList *)GetWindowLong (hwnd,GWL_USERDATA);20 pobj_ResultList=(CResultList *)GetWindowLongPtr(hwnd,GWLP_USERDATA); 21 21 22 22 pSetLayeredWindowAttributes(hwnd, 0,(int)((double)255/(double)100*(double)(pobj_ResultList->iAnimeCount*10)), LWA_ALPHA); … … 38 38 return 0; 39 39 case WM_PAINT: 40 pobj_ResultList=(CResultList *)GetWindowLong (hwnd,GWL_USERDATA);40 pobj_ResultList=(CResultList *)GetWindowLongPtr(hwnd,GWLP_USERDATA); 41 41 42 42 RECT ClientRect; … … 118 118 119 119 case WM_LBUTTONDOWN: 120 pobj_ResultList=(CResultList *)GetWindowLong (hwnd,GWL_USERDATA);120 pobj_ResultList=(CResultList *)GetWindowLongPtr(hwnd,GWLP_USERDATA); 121 121 122 122 GetCursorPos(&pos); … … 149 149 //ウィンドウを半透明にする 150 150 int lStyle; 151 lStyle=GetWindowLong (hwnd,GWL_EXSTYLE) | WS_EX_LAYERED;152 SetWindowLong (hwnd,GWL_EXSTYLE,lStyle);151 lStyle=GetWindowLongPtr(hwnd,GWL_EXSTYLE) | WS_EX_LAYERED; 152 SetWindowLongPtr(hwnd,GWL_EXSTYLE,lStyle); 153 153 pSetLayeredWindowAttributes(hwnd, 0, 0, LWA_ALPHA); 154 154 155 SetWindowLong (hwnd,GWL_USERDATA,(long)this);155 SetWindowLongPtr(hwnd,GWLP_USERDATA,(long)this); 156 156 SetTimer(hwnd,ID_TIMER_POPUP_ANIMATION,10,NULL); 157 157 BringWindowToTop(hwnd); … … 208 208 return 0; 209 209 case WM_PAINT: 210 pobj_OneTab=(COneTab *)GetWindowLong (hwnd,GWL_USERDATA);210 pobj_OneTab=(COneTab *)GetWindowLongPtr(hwnd,GWLP_USERDATA); 211 211 212 212 HBRUSH hBrush,hOldBrush; … … 276 276 return 0; 277 277 case WM_LBUTTONDOWN: 278 pobj_OneTab=(COneTab *)GetWindowLong (hwnd,GWL_USERDATA);278 pobj_OneTab=(COneTab *)GetWindowLongPtr(hwnd,GWLP_USERDATA); 279 279 280 280 ShellExecute(hwnd,"open",pobj_OneTab->lpszUrl[0],NULL,NULL,SW_SHOWNORMAL); -
trunk/abdev/ProjectEditor/WindowControl.cpp
r64 r302 2141 2141 char temporary[MAX_PATH],temp2[1024],*pTemp; 2142 2142 2143 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_NEWWINDOW),hOwner, DlgProject_NewWindow)) return;2143 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_NEWWINDOW),hOwner,(DLGPROC)DlgProject_NewWindow)) return; 2144 2144 2145 2145 //重複チェック
Note:
See TracChangeset
for help on using the changeset viewer.