Changeset 828 in dev for trunk/ab5.0/abdev/abdev
- Timestamp:
- Mar 19, 2012, 1:59:48 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 34 edited
- 2 copied
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/Attach.cpp
r763 r828 4 4 5 5 #include "common.h" 6 #include <abdev/ab_common/include/Path.h> 7 #include <abdev/ab_common/include/ProcessAndModule.h> 6 8 #include <psapi.h> 7 9 #include <tlhelp32.h> … … 37 39 } 38 40 39 void InsertProcess_ToListView(HWND hListView,char *lpszAppPath,int id,char *lpszPlatform,char *lpszTitle){41 void InsertProcess_ToListView(HWND hListView,char const* lpszAppPath,int id,char const* lpszPlatform,char const * lpszTitle){ 40 42 char szAppName[MAX_PATH],temp2[MAX_PATH]; 41 43 _splitpath(lpszAppPath,NULL,NULL,szAppName,temp2); … … 75 77 ListView_SetItem(hListView,&item); 76 78 77 item.pszText= lpszPlatform;79 item.pszText=const_cast<LPSTR>(lpszPlatform); 78 80 item.iSubItem++; 79 81 ListView_SetItem(hListView,&item); 80 82 81 item.pszText= lpszTitle;83 item.pszText=const_cast<LPSTR>(lpszTitle); 82 84 item.iSubItem++; 83 85 ListView_SetItem(hListView,&item); … … 159 161 BOOL CALLBACK FindWindowProc(HWND hwnd, LPARAM lParam) 160 162 { 161 HWND* pphWnd = (HWND*)lParam; 162 *pphWnd = hwnd; 163 return FALSE; /* 列挙を中断 */ 163 auto pProcessIdAndHWnd = reinterpret_cast<std::pair<DWORD, HWND>*>(lParam); 164 DWORD processId = 0; 165 ::GetWindowThreadProcessId(hwnd, &processId); 166 if (processId == pProcessIdAndHWnd->first) 167 { 168 pProcessIdAndHWnd->second = hwnd; 169 return FALSE; 170 } 171 else 172 { 173 return TRUE; 174 } 164 175 } 165 176 void ListupProcesses(HWND hListView){ 166 char temporary[MAX_PATH];167 168 177 ListView_DeleteAllItems(hListView); 169 178 170 DWORD *pdwProcessId;171 pdwProcessId=(DWORD *)HeapAlloc(hHeap,0,8192*sizeof(DWORD));172 173 179 //プロセスを列挙 174 DWORD cbNeeded; 175 EnumProcesses(pdwProcessId,8192*sizeof(DWORD),&cbNeeded); 176 177 char szMyAppPath[MAX_PATH]; 178 GetModuleFileName(GetModuleHandle(0),szMyAppPath,MAX_PATH); 179 180 int i; 181 for(i=0;i<(int)(cbNeeded/sizeof(DWORD));i++){ 182 183 //プロセスIDを元にハンドルを取得 184 HANDLE hProcess; 185 hProcess=OpenProcess(PROCESS_ALL_ACCESS,0,pdwProcessId[i]); 186 if(!hProcess) continue; 187 180 auto processIds = ActiveBasic::Common::GetProcesses(); 181 182 char szMyAppPath[MAX_PATH] = {}; 183 GetModuleFileName(nullptr, szMyAppPath, MAX_PATH); 184 185 BOOST_FOREACH(DWORD processId, processIds) 186 { 188 187 //そのプロセスにおける実行モジュールのインスタンスハンドルを取得 189 HINSTANCE hModule; 190 DWORD cbReturned; 191 if(!EnumProcessModules( hProcess, &hModule, sizeof(HINSTANCE), &cbReturned )) 192 continue; 193 194 //実行ファイル名を取得 195 GetModuleFileNameEx(hProcess,hModule,temporary,MAX_PATH); 196 188 auto executablePath = ActiveBasic::Common::GetExecutableModulePath(processId); 197 189 198 190 ////////////////////////////// … … 200 192 ////////////////////////////// 201 193 202 //スナップショットを取得 203 HANDLE hSnapshot; 204 hSnapshot=CreateToolhelp32Snapshot(TH32CS_SNAPALL,0); 205 206 THREADENTRY32 te; 207 memset(&te,0,sizeof(THREADENTRY32)); 208 te.dwSize=sizeof(THREADENTRY32); 209 if(Thread32First(hSnapshot,&te)){ 210 do{ 211 if(te.th32OwnerProcessID==pdwProcessId[i]){ 212 break; 213 } 214 }while(Thread32Next(hSnapshot,&te)); 215 } 216 217 HWND hwnd; 218 hwnd=0; 219 EnumThreadWindows(te.th32ThreadID,FindWindowProc,(LPARAM)&hwnd); 220 221 while(GetParent(hwnd)) hwnd=GetParent(hwnd); 222 223 char szWndTitle[1024]; 224 szWndTitle[0]=0; 225 if(hwnd) GetWindowText(hwnd,szWndTitle,1024); 226 227 CloseHandle(hSnapshot); 228 229 230 231 CloseHandle(hProcess); 232 233 if(lstrcmpi(szMyAppPath,temporary)==0){ 194 std::pair<DWORD, HWND> processIdAndHWnd(processId, nullptr); 195 EnumWindows(FindWindowProc, reinterpret_cast<LPARAM>(&processIdAndHWnd)); 196 HWND hwnd = processIdAndHWnd.second; 197 198 TCHAR szWndTitle[1024] = {}; 199 if(hwnd) GetWindowText(hwnd, szWndTitle, 1024); 200 201 if (ActiveBasic::Common::IsPathEqual(Jenga::Common::ToWString(szMyAppPath).c_str(), executablePath.wstring().c_str())) 202 { 234 203 //自分自身(ProjectEditor.exe)は無視 235 204 continue; … … 237 206 238 207 //リストビューへ追加 239 InsertProcess_ToListView(hListView,temporary,pdwProcessId[i],"Win32",szWndTitle); 240 } 241 242 HeapDefaultFree(pdwProcessId); 208 InsertProcess_ToListView(hListView,executablePath.string().c_str(),processId,"Win32",szWndTitle); 209 } 243 210 } 244 211 -
trunk/ab5.0/abdev/abdev/ChildWndOnRebar.cpp
r629 r828 229 229 230 230 231 #define ADD_TOOLBAR_BUTTON(id, iconID,lpszToolTip) pobj_StandardToolbar->Add(id,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)231 #define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_StandardToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip)) 232 232 #define ADD_TOOLBAR_SEPARATOR pobj_StandardToolbar->Add(0,0,0) 233 233 //ボタン類を追加 … … 279 279 pobj_DebuggerToolbar->Create(hDebuggerToolbarPager); 280 280 281 #define ADD_TOOLBAR_BUTTON(id, iconID,lpszToolTip) pobj_DebuggerToolbar->Add(id,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)281 #define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_DebuggerToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip)) 282 282 #define ADD_TOOLBAR_SEPARATOR pobj_DebuggerToolbar->Add(0,0,0) 283 283 //ボタン類を追加 … … 327 327 pobj_ReleaseToolbar->Create(hReleaseToolbarPager); 328 328 329 #define ADD_TOOLBAR_BUTTON(id, iconID,lpszToolTip) pobj_ReleaseToolbar->Add(id,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)329 #define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_ReleaseToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip)) 330 330 #define ADD_TOOLBAR_SEPARATOR pobj_ReleaseToolbar->Add(0,0,0) 331 331 //ボタン類を追加 -
trunk/ab5.0/abdev/abdev/Common.h
r772 r828 33 33 #include "Debugger.h" 34 34 35 #include <Resource/Load.h> 35 36 36 37 #pragma comment(lib, "wininet.lib") … … 627 628 void GetFullPath(char *path,const char *dir); 628 629 void RemoveDirectoryStrong(const char *dirPath); 629 BOOL GetFilePathDialog(HWND hwnd,char *filename,LP STR Filter,LPSTR Title,_int8IsOpen);630 BOOL GetFilePathDialog(HWND hwnd,char *filename,LPCSTR Filter,LPCSTR Title,BOOL IsOpen); 630 631 BOOL GetFolder(HWND hWnd,char *folder,char *OpenFolderTitle); 631 632 int GetFileExtension( const char *path ); -
trunk/ab5.0/abdev/abdev/Complement.cpp
r655 r828 754 754 hImageList=ImageList_Create(16, 16, ILC_COLOR24, 7, 0); 755 755 ListView_SetImageList(hListView, hImageList, LVSIL_SMALL); 756 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_MEMBER_PRIVATE_VARIABLE)));757 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_MEMBER_PUBLIC_VARIABLE)));758 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_MEMBER_PRIVATE_FUNCTION)));759 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_MEMBER_PUBLIC_FUNCTION)));760 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_PAIRSTATEMENT)));761 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_HTML_GENERAL_PARAMETER)));762 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_HTML_PARAMETER)));756 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_VARIABLE)); 757 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_VARIABLE)); 758 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_FUNCTION)); 759 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_FUNCTION)); 760 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_PAIRSTATEMENT)); 761 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_HTML_GENERAL_PARAMETER)); 762 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_HTML_PARAMETER)); 763 763 764 764 return 0; -
trunk/ab5.0/abdev/abdev/DialogBoxes.cpp
r763 r828 502 502 void DlgNewProjectWizard(HWND hwnd){ 503 503 #define MAX_NEWPROJECTPAGE 3 504 PROPSHEETHEADER psh ;505 PROPSHEETPAGE psp ;506 HPROPSHEETPAGE hpsp[MAX_NEWPROJECTPAGE] ;504 PROPSHEETHEADER psh = {}; 505 PROPSHEETPAGE psp = {}; 506 HPROPSHEETPAGE hpsp[MAX_NEWPROJECTPAGE] = {}; 507 507 int i; 508 508 509 psp.dwSize =sizeof(PROPSHEETPAGE);510 psp.hInstance =hResInst;511 psp.dwFlags =PSP_DEFAULT;509 psp.dwSize = sizeof(PROPSHEETPAGE); 510 psp.hInstance = GetWindowInstance(hwnd); 511 psp.dwFlags = PSP_DLGINDIRECT; 512 512 513 513 //各ページのセッティング 514 514 i=0; 515 psp.p szTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE1);515 psp.pResource = static_cast<PROPSHEETPAGE_RESOURCE>(ActiveBasic::Resource::LoadResourceAlt(hResInst, IDD_NEWPROJECT_PAGE1, RT_DIALOG)); 516 516 psp.pfnDlgProc=DlgNewProject_Page1; 517 517 hpsp[i]=CreatePropertySheetPage(&psp); 518 518 i++; 519 psp.p szTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE2);519 psp.pResource = static_cast<PROPSHEETPAGE_RESOURCE>(ActiveBasic::Resource::LoadResourceAlt(hResInst, IDD_NEWPROJECT_PAGE2, RT_DIALOG)); 520 520 psp.pfnDlgProc=DlgNewProject_Page2; 521 521 hpsp[i]=CreatePropertySheetPage(&psp); 522 522 i++; 523 psp.p szTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE3);523 psp.pResource = static_cast<PROPSHEETPAGE_RESOURCE>(ActiveBasic::Resource::LoadResourceAlt(hResInst, IDD_NEWPROJECT_PAGE3, RT_DIALOG)); 524 524 psp.pfnDlgProc=DlgNewProject_Page3; 525 525 hpsp[i]=CreatePropertySheetPage(&psp); … … 630 630 ImageList_AddIcon(hImageList, LoadIcon(hInst, MAKEINTRESOURCE(IDI_FILE_BAS))); 631 631 ImageList_AddIcon(hImageList, LoadIcon(hInst, MAKEINTRESOURCE(IDI_FILE_SBP))); 632 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_NEWFILE_PJ)));633 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_NEWFILE_TEXT)));634 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_NEWFILE_HTML)));635 ImageList_AddIcon(hImageList, LoadIcon(hResInst, MAKEINTRESOURCE(IDI_NEWFILE_ICON)));632 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_PJ)); 633 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_TEXT)); 634 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_HTML)); 635 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_ICON)); 636 636 637 637 … … 947 947 switch(LOWORD(wParam)){ 948 948 case IDC_DIR: 949 extern LPSTR ExeFileFilter;949 extern const LPCSTR ExeFileFilter; 950 950 if(!GetFilePathDialog(hwnd,temporary,ExeFileFilter,"DLLデバッグ用の実行可能ファイルを指定してください",1)) break; 951 951 … … 967 967 } 968 968 void DlgProjectOptionSetting(HWND hwnd){ 969 PROPSHEETHEADER psh ;970 PROPSHEETPAGE psp[MAX_PJSETDLG] ;971 HPROPSHEETPAGE hpsp[MAX_PJSETDLG] ;969 PROPSHEETHEADER psh = {}; 970 PROPSHEETPAGE psp[MAX_PJSETDLG] = {}; 971 HPROPSHEETPAGE hpsp[MAX_PJSETDLG] = {}; 972 972 int i; 973 973 memset(&SetSwitch,0,MAX_PJSETDLG); … … 976 976 i=0; 977 977 psp[i].dwSize=sizeof(PROPSHEETPAGE); 978 psp[i].dwFlags =PSP_DEFAULT;979 psp[i].hInstance =hResInst;980 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION1);981 psp[i].pfnDlgProc =(DLGPROC)DlgProjectOption_Whole;978 psp[i].dwFlags = PSP_DLGINDIRECT; 979 psp[i].hInstance = GetWindowInstance(hwnd); 980 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(ActiveBasic::Resource::LoadResourceAlt(hResInst, IDD_PJ_OPTION1, RT_DIALOG)); 981 psp[i].pfnDlgProc = DlgProjectOption_Whole; 982 982 hpsp[i]=CreatePropertySheetPage(&psp[i]); 983 983 i++; 984 984 psp[i].dwSize=sizeof(PROPSHEETPAGE); 985 psp[i].dwFlags=PSP_D EFAULT;986 psp[i].hInstance =hResInst;987 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION2);988 psp[i].pfnDlgProc =(DLGPROC)DlgProjectOption_Win32API;985 psp[i].dwFlags=PSP_DLGINDIRECT; 986 psp[i].hInstance = GetWindowInstance(hwnd); 987 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(ActiveBasic::Resource::LoadResourceAlt(hResInst, IDD_PJ_OPTION2, RT_DIALOG)); 988 psp[i].pfnDlgProc = DlgProjectOption_Win32API; 989 989 hpsp[i]=CreatePropertySheetPage(&psp[i]); 990 990 i++; 991 991 psp[i].dwSize=sizeof(PROPSHEETPAGE); 992 psp[i].dwFlags =PSP_DEFAULT;993 psp[i].hInstance =hResInst;994 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION3);995 psp[i].pfnDlgProc =(DLGPROC)DlgProjectOption_Manifest;992 psp[i].dwFlags = PSP_DLGINDIRECT; 993 psp[i].hInstance = GetWindowInstance(hwnd); 994 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(ActiveBasic::Resource::LoadResourceAlt(hResInst, IDD_PJ_OPTION3, RT_DIALOG)); 995 psp[i].pfnDlgProc = DlgProjectOption_Manifest; 996 996 hpsp[i]=CreatePropertySheetPage(&psp[i]); 997 997 i++; 998 998 psp[i].dwSize=sizeof(PROPSHEETPAGE); 999 psp[i].dwFlags =PSP_DEFAULT;1000 psp[i].hInstance =hResInst;1001 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION4);1002 psp[i].pfnDlgProc =(DLGPROC)DlgProjectOption_Debug;999 psp[i].dwFlags = PSP_DLGINDIRECT; 1000 psp[i].hInstance = GetWindowInstance(hwnd); 1001 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(ActiveBasic::Resource::LoadResourceAlt(hResInst, IDD_PJ_OPTION4, RT_DIALOG)); 1002 psp[i].pfnDlgProc = DlgProjectOption_Debug; 1003 1003 hpsp[i]=CreatePropertySheetPage(&psp[i]); 1004 1004 … … 1955 1955 return 0; 1956 1956 } 1957 PROPSHEETPAGE_RESOURCE LoadTest(HINSTANCE hinst, USHORT id, LPCTSTR type) 1958 { 1959 auto t = ActiveBasic::Resource::LoadResourceAltWithSize(hResInst, id, type); 1960 auto p = malloc(t.second); 1961 memcpy(p, t.first, t.second); 1962 return static_cast<PROPSHEETPAGE_RESOURCE>(p); 1963 } 1957 1964 void DlgOptionSetting(HWND hwnd){ 1958 PROPSHEETHEADER psh; 1965 HINSTANCE hinst = GetWindowInstance(hwnd); 1966 PROPSHEETHEADER psh = {}; 1959 1967 #define MAX_SETDLG 32 1960 PROPSHEETPAGE psp[MAX_SETDLG] ;1961 HPROPSHEETPAGE hpsp[MAX_SETDLG] ;1968 PROPSHEETPAGE psp[MAX_SETDLG] = {}; 1969 HPROPSHEETPAGE hpsp[MAX_SETDLG] = {}; 1962 1970 int i; 1963 1971 … … 1970 1978 i=0; 1971 1979 1980 1972 1981 //各ページのセッティング 1973 1982 psp[i].dwSize=sizeof(PROPSHEETPAGE); 1974 psp[i].dwFlags=PSP_D EFAULT;1975 psp[i].hInstance=h ResInst;1976 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_OPTION_WHOLE);1977 psp[i].pfnDlgProc= (DLGPROC)Dlg_Option_Whole;1983 psp[i].dwFlags=PSP_DLGINDIRECT; 1984 psp[i].hInstance=hinst; 1985 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(LoadTest(hResInst, IDD_OPTION_WHOLE, RT_DIALOG)); 1986 psp[i].pfnDlgProc=Dlg_Option_Whole; 1978 1987 hpsp[i]=CreatePropertySheetPage(&psp[i]); 1979 1988 i++; 1980 1989 psp[i].dwSize=sizeof(PROPSHEETPAGE); 1981 psp[i].dwFlags=PSP_D EFAULT;1982 psp[i].hInstance=h ResInst;1983 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_OPTION_EDITOR);1984 psp[i].pfnDlgProc= (DLGPROC)Dlg_Option_Editor;1990 psp[i].dwFlags=PSP_DLGINDIRECT; 1991 psp[i].hInstance=hinst; 1992 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(LoadTest(hResInst, IDD_OPTION_EDITOR, RT_DIALOG)); 1993 psp[i].pfnDlgProc=Dlg_Option_Editor; 1985 1994 hpsp[i]=CreatePropertySheetPage(&psp[i]); 1986 1995 i++; 1987 1996 psp[i].dwSize=sizeof(PROPSHEETPAGE); 1988 psp[i].dwFlags=PSP_D EFAULT;1989 psp[i].hInstance=h ResInst;1990 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_OPTION_COLOR);1991 psp[i].pfnDlgProc= (DLGPROC)Dlg_Option_Color;1997 psp[i].dwFlags=PSP_DLGINDIRECT; 1998 psp[i].hInstance=hinst; 1999 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(LoadTest(hResInst, IDD_OPTION_COLOR, RT_DIALOG)); 2000 psp[i].pfnDlgProc=Dlg_Option_Color; 1992 2001 hpsp[i]=CreatePropertySheetPage(&psp[i]); 1993 2002 i++; 1994 2003 psp[i].dwSize=sizeof(PROPSHEETPAGE); 1995 psp[i].dwFlags=PSP_D EFAULT;1996 psp[i].hInstance=h ResInst;1997 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_OPTION_TOOLBAR);1998 psp[i].pfnDlgProc= (DLGPROC)Dlg_Option_Toolbar;2004 psp[i].dwFlags=PSP_DLGINDIRECT; 2005 psp[i].hInstance=hinst; 2006 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(LoadTest(hResInst, IDD_OPTION_TOOLBAR, RT_DIALOG)); 2007 psp[i].pfnDlgProc=Dlg_Option_Toolbar; 1999 2008 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2000 2009 … … 2003 2012 i++; 2004 2013 psp[i].dwSize=sizeof(PROPSHEETPAGE); 2005 psp[i].dwFlags=PSP_D EFAULT;2006 psp[i].hInstance=h ResInst;2007 psp[i].p szTemplate=MAKEINTRESOURCE(IDD_OPTION_RAD);2008 psp[i].pfnDlgProc= (DLGPROC)Dlg_Option_Rad;2014 psp[i].dwFlags=PSP_DLGINDIRECT; 2015 psp[i].hInstance=hinst; 2016 psp[i].pResource = static_cast<PROPSHEETPAGE_RESOURCE>(LoadTest(hResInst, IDD_OPTION_RAD, RT_DIALOG)); 2017 psp[i].pfnDlgProc=Dlg_Option_Rad; 2009 2018 hpsp[i]=CreatePropertySheetPage(&psp[i]); 2010 2019 #endif … … 2039 2048 #ifndef THETEXT 2040 2049 //ライブラリ開発チーム 2041 LoadString(hResInst,IDS_DEV_GROUP,temporary,1024); 2042 SetDlgItemText(hwnd,IDC_DEV_GROUP,temporary); 2050 boost::optional<std::wstring> devGroup = ActiveBasic::Resource::LoadStringAlt(hResInst, IDS_DEV_GROUP); 2051 if (devGroup) 2052 { 2053 SetDlgItemTextW(hwnd, IDC_DEV_GROUP, devGroup->c_str()); 2054 } 2043 2055 #endif 2044 2056 ApplyDialogTexture(hwnd); -
trunk/ab5.0/abdev/abdev/DrawBuffer.cpp
r772 r828 222 222 223 223 if(bBreakPoint){ 224 DrawIconEx(memdc,3,i*font_height+(font_height-16)/2, 225 (HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(IDI_BREAKPOINT_FLAG),IMAGE_ICON,16,16,LR_SHARED), 226 16,16,0,NULL,DI_NORMAL); 224 ActiveBasic::Resource::UniqueHIcon hicon(ActiveBasic::Resource::LoadIconAlt(hIconResInst, IDI_BREAKPOINT_FLAG, 16, 16)); 225 DrawIconEx(memdc,3,i*font_height+(font_height-16)/2,hicon.get(),16,16,0,NULL,DI_NORMAL); 227 226 } 228 227 else{ … … 272 271 } 273 272 }; 273 274 static bool IsRemoteSession() 275 { 276 OSVERSIONINFO vi = {sizeof vi}; 277 BOOL ret = ::GetVersionEx(&vi); 278 if (ret && vi.dwMajorVersion >= 5) 279 { 280 const int SM_REMOTESESSION = 0x1000; 281 return GetSystemMetrics(SM_REMOTESESSION); 282 } 283 return false; 284 } 274 285 275 286 void TextEdit_DrawBuffer(HDC hdc,int WndNum,bool drawDirectly){ … … 307 318 OnePage_CharHeight, 308 319 iLineNumberTextCount, 309 drawDirectly || GetSystemMetrics(SM_REMOTESESSION));320 drawDirectly || IsRemoteSession()); 310 321 311 322 -
trunk/ab5.0/abdev/abdev/ExtensionLink.cpp
r717 r828 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]; -
trunk/ab5.0/abdev/abdev/FileOperation.cpp
r772 r828 190 190 } 191 191 192 BOOL GetFilePathDialog(HWND hwnd,char *filename,LP STR Filter,LPSTR Title,_int8IsOpen){192 BOOL GetFilePathDialog(HWND hwnd,char *filename,LPCSTR Filter,LPCSTR Title,BOOL IsOpen){ 193 193 OPENFILENAME ofstr; 194 194 filename[0]=0; … … 345 345 BOOL SaveDocument(HWND hChild,char *SaveFileName){ //ウィンドウからバッファを読み取り、ファイルに保存 346 346 //SaveFileNameがNULLのときは上書き保存を試みる。 347 extern LPSTR IconFileFilter;347 extern const LPCSTR IconFileFilter; 348 348 extern HWND hClient,hDocCombo; 349 349 int WndNum,i2; … … 415 415 get_file_path: 416 416 417 LP STR ff;418 419 extern LPSTR DefFileFilter;420 extern LPSTR HtmlFileFilter;421 extern LPSTR TextFileFilter;417 LPCSTR ff; 418 419 extern const LPCSTR DefFileFilter; 420 extern const LPCSTR HtmlFileFilter; 421 extern const LPCSTR TextFileFilter; 422 422 if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC) 423 423 ff=DefFileFilter; -
trunk/ab5.0/abdev/abdev/FileTree.cpp
r705 r828 98 98 case IDM_FILETREE_INSERT: 99 99 //"プロジェクトへ挿入するファイルを指定して下さい" 100 extern LPSTR DefFileFilter;100 extern const LPCSTR DefFileFilter; 101 101 if(!GetFilePathDialog(hOwner,temporary,DefFileFilter,STRING_FILEOPENTITLE_INSERTEDPROJECT,1)) break; 102 102 Project_File_Insert(temporary); … … 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 } … … 160 160 //イメージリスト読み込み、設定 161 161 hImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,3,0); 162 ImageList_AddIcon(hImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_CLOSE)));163 ImageList_AddIcon(hImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_OPEN)));164 ImageList_AddIcon(hImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_TEXTDOCUMENT)));162 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_CLOSE)); 163 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_OPEN)); 164 ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT)); 165 165 this->SetImageList(hImageList,TVSIL_NORMAL); 166 166 } -
trunk/ab5.0/abdev/abdev/IconEditor.cpp
r772 r828 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登録 -
trunk/ab5.0/abdev/abdev/IconEditor_Main.cpp
r629 r828 1199 1199 InvalidateRect(hwnd,NULL,0); 1200 1200 1201 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_PEN)));1201 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_PEN)); 1202 1202 } 1203 1203 else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILL){ … … 1214 1214 InvalidateRect(hwnd,NULL,0); 1215 1215 } 1216 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_FILL)));1216 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_FILL)); 1217 1217 } 1218 1218 else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE|| … … 1496 1496 } 1497 1497 else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_PEN) 1498 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_PEN)));1498 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_PEN)); 1499 1499 else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILL) 1500 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_FILL)));1500 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_FILL)); 1501 1501 else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE|| 1502 1502 MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE|| -
trunk/ab5.0/abdev/abdev/IconEditor_Tool.cpp
r763 r828 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 hResInst,(unsigned int)MAKEINTRESOURCE(IDR_ICONTOOLBAR),IconToolBar, 59 nullptr, 60 reinterpret_cast<UINT_PTR>(ActiveBasic::Resource::LoadBitmapAlt(hResInst, IDR_ICONTOOLBAR)), 61 IconToolBar, 60 62 BMPNUM_ICONTOOLBAR, /*アイテムの個数*/ 61 63 0,0,16,15,sizeof(TBBUTTON)); … … 188 190 switch(LOWORD(wParam)){ 189 191 case IDC_ADD_ICONTYPE: 190 i =DialogBox(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_ICONTYPE),GetParent(hwnd),DlgIconType);192 i = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ICONEDIT_ICONTYPE, GetParent(hwnd), DlgIconType); 191 193 if(i==-1) return 1; 192 194 -
trunk/ab5.0/abdev/abdev/MenuProc.cpp
r772 r828 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 -
trunk/ab5.0/abdev/abdev/NonVolatile.h
r480 r828 1 1 2 2 3 class CNonVolatile:public CSettingFile{ 3 class CNonVolatile : public CSettingFile, boost::noncopyable 4 { 4 5 void InitToDefaultData(); 5 6 -
trunk/ab5.0/abdev/abdev/ParameterHint.cpp
r713 r828 1096 1096 HBITMAP hBmp,hOldBmp; 1097 1097 HDC memdc; 1098 hBmp =(HBITMAP)LoadImage(hResInst,MAKEINTRESOURCE(IDB_PARAMHINT_QUESTION),IMAGE_BITMAP,0,0,LR_DEFAULTSIZE);1098 hBmp = ActiveBasic::Resource::LoadBitmapAlt(hResInst, IDB_PARAMHINT_QUESTION); 1099 1099 memdc=CreateCompatibleDC(hdc); 1100 1100 hOldBmp=(HBITMAP)SelectObject(memdc,hBmp); … … 1119 1119 hdc=GetDC(hwnd); 1120 1120 1121 hBmp =(HBITMAP)LoadImage(hResInst,MAKEINTRESOURCE(IDB_PARAMHINT_QUESTION2),IMAGE_BITMAP,0,0,LR_DEFAULTSIZE);1121 hBmp = ActiveBasic::Resource::LoadBitmapAlt(hResInst,IDB_PARAMHINT_QUESTION2); 1122 1122 memdc=CreateCompatibleDC(hdc); 1123 1123 hOldBmp=(HBITMAP)SelectObject(memdc,hBmp); … … 1137 1137 hdc=GetDC(hwnd); 1138 1138 1139 hBmp =(HBITMAP)LoadImage(hResInst,MAKEINTRESOURCE(IDB_PARAMHINT_QUESTION),IMAGE_BITMAP,0,0,LR_DEFAULTSIZE);1139 hBmp = ActiveBasic::Resource::LoadBitmapAlt(hResInst, IDB_PARAMHINT_QUESTION); 1140 1140 memdc=CreateCompatibleDC(hdc); 1141 1141 hOldBmp=(HBITMAP)SelectObject(memdc,hBmp); -
trunk/ab5.0/abdev/abdev/Print.cpp
r763 r828 421 421 //拡大・縮小アイコンを表示 422 422 SendDlgItemMessage(hwnd,IDC_ZOOMOUT,BM_SETIMAGE,IMAGE_ICON , 423 (LPARAM)LoadImage(hResInst,MAKEINTRESOURCE(IDI_ZOOMOUT),IMAGE_ICON,16,16,LR_SHARED));423 reinterpret_cast<LPARAM>(ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_ZOOMOUT, 16, 16, LR_SHARED))); 424 424 SendDlgItemMessage(hwnd,IDC_ZOOMIN,BM_SETIMAGE,IMAGE_ICON , 425 (LPARAM)LoadImage(hResInst,MAKEINTRESOURCE(IDI_ZOOMIN),IMAGE_ICON,16,16,LR_SHARED));425 reinterpret_cast<LPARAM>(ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_ZOOMIN, 16, 16, LR_SHARED))); 426 426 iZoomNowPage=ZOOM_INIT; 427 427 … … 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 -
trunk/ab5.0/abdev/abdev/ProjectControl.cpp
r705 r828 42 42 LRESULT CALLBACK TabProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 43 43 extern HANDLE hHeap; 44 extern LPSTR DefFileFilter;44 extern const LPCSTR DefFileFilter; 45 45 int i,i2,WndNum; 46 46 char str[MAX_PATH],temporary[MAX_PATH]; … … 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 //重複チェック … … 466 469 //イメージリスト読み込み、設定 467 470 hProcedureTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,8,0); 468 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_CLOSE)));469 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_OPEN)));470 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_PROCEDURE)));471 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_PROGRAM_FOLDER)));472 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_MEMBER_PUBLIC_VARIABLE)));473 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_MEMBER_PUBLIC_FUNCTION)));474 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_MEMBER_PRIVATE_VARIABLE)));475 ImageList_AddIcon(hProcedureTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_MEMBER_PRIVATE_FUNCTION)));471 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_CLOSE)); 472 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_OPEN)); 473 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_PROCEDURE)); 474 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_PROGRAM_FOLDER)); 475 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_VARIABLE)); 476 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_FUNCTION)); 477 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_VARIABLE)); 478 ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_FUNCTION)); 476 479 TreeView_SetImageList(hProcedureTreeView,hProcedureTreeViewImageList,TVSIL_NORMAL); 477 480 … … 485 488 //イメージリスト読み込み、設定 486 489 hMaterialTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,3,0); 487 ImageList_AddIcon(hMaterialTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_CLOSE)));488 ImageList_AddIcon(hMaterialTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FOLDER_OPEN)));489 ImageList_AddIcon(hMaterialTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_WINDOW)));490 ImageList_AddIcon(hMaterialTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_MENU)));491 ImageList_AddIcon(hMaterialTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FILE_ICON)));492 ImageList_AddIcon(hMaterialTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FILE_BMP)));493 ImageList_AddIcon(hMaterialTreeViewImageList, LoadIcon(hResInst,MAKEINTRESOURCE(IDI_FILE_CURSOR)));490 ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_CLOSE)); 491 ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_OPEN)); 492 ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_WINDOW)); 493 ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MENU)); 494 ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FILE_ICON)); 495 ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FILE_BMP)); 496 ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FILE_CURSOR)); 494 497 TreeView_SetImageList(hMaterialTreeView,hMaterialTreeViewImageList,TVSIL_NORMAL); 495 498 -
trunk/ab5.0/abdev/abdev/RadProc.cpp
r772 r828 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: -
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; -
trunk/ab5.0/abdev/abdev/Resource.cpp
r629 r828 14 14 void Project_CursorResInsert(void){ 15 15 extern HANDLE hHeap; 16 extern LPSTR CursorFileFilter;16 extern const LPCSTR CursorFileFilter; 17 17 int i3; 18 18 char temporary[MAX_PATH]; … … 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 //重複チェック … … 111 114 void Project_BitmapResInsert(void){ 112 115 extern HANDLE hHeap; 113 extern LPSTR BitmapFileFilter;116 extern const LPCSTR BitmapFileFilter; 114 117 int i2,i3; 115 118 char temporary[MAX_PATH]; … … 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 //重複チェック … … 217 223 void Project_IconResInsert(void){ 218 224 extern HANDLE hHeap; 219 extern LPSTR IconFileFilter;225 extern const LPCSTR IconFileFilter; 220 226 int i2,i3; 221 227 char temporary[MAX_PATH]; … … 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 //重複チェック -
trunk/ab5.0/abdev/abdev/Search.cpp
r763 r828 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 -
trunk/ab5.0/abdev/abdev/SubOperation.cpp
r772 r828 692 692 const std::string resDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\res.dll"; 693 693 hResInst = LoadLibrary( resDllPath.c_str() ); 694 if(!hResInst){ 695 MessageBox(0,"res.dllの読み込みに失敗しました。",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION); 696 return 0; 697 } 694 698 695 699 //アイコンリソースDLLをマッピング 696 700 const std::string iconResDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\icon_res.dll"; 697 hIconResInst = LoadLibrary( iconResDllPath.c_str() ); 701 hIconResInst = LoadLibraryEx( iconResDllPath.c_str(), nullptr, LOAD_LIBRARY_AS_DATAFILE ); 702 if(!hIconResInst){ 703 MessageBox(0,"icon_res.dllの読み込みに失敗しました。",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION); 704 return 0; 705 } 698 706 699 707 //LuxCtrl.dllをマッピング … … 830 838 extern HICON hOwnerIcon,hBasicProgramIcon,hTextDocumentIcon,hWindowDocumentIcon; 831 839 hOwnerIcon=(HICON)LoadImage(hInst,MAKEINTRESOURCE(IDI_MAIN),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); 832 hBasicProgramIcon =(HICON)LoadImage(hResInst,MAKEINTRESOURCE(IDI_BASICPROGRAM),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);833 hTextDocumentIcon =(HICON)LoadImage(hResInst,MAKEINTRESOURCE(IDI_TEXTDOCUMENT),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);834 hWindowDocumentIcon =(HICON)LoadImage(hResInst,MAKEINTRESOURCE(IDI_WINDOW),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);840 hBasicProgramIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR); 841 hTextDocumentIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT, 16, 16, LR_DEFAULTCOLOR); 842 hWindowDocumentIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_WINDOW, 16, 16, LR_DEFAULTCOLOR); 835 843 836 844 … … 838 846 839 847 //メインメニュー 840 pobj_MainMenu=new CMenuEx( LoadMenu(hResInst,MAKEINTRESOURCE(IDR_MAINMENU)));848 pobj_MainMenu=new CMenuEx(ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_MAINMENU)); 841 849 842 850 pobj_MainMenu->InitOwnerDraw(1); //オーナー描画の初期化 … … 872 880 } 873 881 874 #define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon(itemID,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0));882 #define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon((itemID), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16)); 875 883 //メニューアイコンをセット 876 884 … … 946 954 947 955 extern HMENU hEditMenuBase,hEditMenu; 948 hEditMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_EDITMENU));956 hEditMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_EDITMENU); 949 957 hEditMenu=GetSubMenu(hEditMenuBase,0); 950 958 951 959 extern HMENU hRebarMenuBase,hRebarMenu; 952 hRebarMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_REBARMENU));960 hRebarMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_REBARMENU); 953 961 hRebarMenu=GetSubMenu(hRebarMenuBase,0); 954 962 955 963 extern HMENU hTabMenuBase,hTabMenu,hTabColorMenu; 956 hTabMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_TABMENU));964 hTabMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_TABMENU); 957 965 hTabMenu=GetSubMenu(hTabMenuBase,0); 958 966 hTabColorMenu=GetSubMenu(hTabMenu,0); 959 967 960 968 extern HMENU hFileTreeMenuBase; 961 hFileTreeMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_FILETREEMENU));969 hFileTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_FILETREEMENU); 962 970 963 971 extern HMENU hProcedureTreeMenuBase; 964 hProcedureTreeMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_PROCEDURETREEMENU));972 hProcedureTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_PROCEDURETREEMENU); 965 973 966 974 extern HMENU hMaterialTreeMenuBase; 967 hMaterialTreeMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_PROJECTVIEW_MATERIALTREEMENU));975 hMaterialTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_MATERIALTREEMENU); 968 976 969 977 extern HMENU hRadMenuBase; 970 hRadMenuBase =LoadMenu(hResInst,MAKEINTRESOURCE(IDR_RADCONTEXTMENU));978 hRadMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_RADCONTEXTMENU); 971 979 972 980 //クリップボードのデータ形式(RAD用)を新規登録 … … 1201 1209 //実行コマンド 1202 1210 BOOL SetRunning(HWND hChild){ 1203 extern LPSTR DefFileFilter;1211 extern const LPCSTR DefFileFilter; 1204 1212 int WndNum; 1205 1213 char temp2[MAX_PATH]; -
trunk/ab5.0/abdev/abdev/TabCtrl.cpp
r772 r828 357 357 // タブ枠を描画 358 358 //////////////////////////// 359 colorGray= reinterpret_cast<ItemInfo*>( item.lParam )->Color;359 colorGray=item.lParam ? reinterpret_cast<ItemInfo*>( item.lParam )->Color : RGB(0xcc, 0xcc, 0xcc); 360 360 361 361 //ブラシを生成 … … 412 412 // タブ枠を描画 413 413 //////////////////////////// 414 colorGray= reinterpret_cast<ItemInfo*>( item.lParam )->Color;414 colorGray=item.lParam ? reinterpret_cast<ItemInfo*>( item.lParam )->Color : RGB(0xcc, 0xcc, 0xcc); 415 415 416 416 //ブラシを生成 -
trunk/ab5.0/abdev/abdev/TextEditor_EventProc.cpp
r772 r828 29 29 int hide_caret_switch; 30 30 31 const UINT WM_IME_REQUEST = 0x0288; 31 32 LRESULT CALLBACK TextEditProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 32 33 extern HANDLE hHeap; -
trunk/ab5.0/abdev/abdev/TextEditor_MouseEvent.cpp
r629 r828 69 69 70 70 //カーソルを矢印マークにする 71 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_ARROW_TO_RIGHT)));71 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT)); 72 72 73 73 GetNaturalCaretPos_Click(WndNum, … … 129 129 130 130 //カーソルを矢印マークにする 131 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_ARROW_TO_RIGHT)));131 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT)); 132 132 } 133 133 … … 255 255 256 256 //カーソルを矢印マークにする 257 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_ARROW_TO_RIGHT)));257 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT)); 258 258 259 259 return; … … 321 321 322 322 //カーソルを矢印マーク(デフォルト)にする 323 SetCursor( LoadCursor(hResInst,MAKEINTRESOURCE(IDC_CURSOR_ARROW_TO_RIGHT)));323 SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT)); 324 324 325 325 return; -
trunk/ab5.0/abdev/abdev/WindowControl.cpp
r700 r828 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 //重複チェック -
trunk/ab5.0/abdev/abdev/abdev.cpp
r773 r828 2 2 3 3 #include "abdev.h" 4 5 #if _ATL_VER == 0x0800 6 #pragma comment(lib, "atlthunk.lib") 7 #endif 4 8 5 9 #ifdef _DEBUG … … 910 914 SHFILEINFO shfi; 911 915 if(filepath) 916 { 912 917 SHGetFileInfo(filepath, FILE_ATTRIBUTE_ARCHIVE, &shfi, sizeof(SHFILEINFO), SHGFI_ICON | SHGFI_SMALLICON ); 913 else shfi.hIcon=(HICON)LoadImage(hResInst,MAKEINTRESOURCE(IDI_TEXTDOCUMENT),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);; 918 } 919 else 920 { 921 shfi.hIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT, 16, 16, LR_DEFAULTCOLOR); 922 } 914 923 mdic.lParam=(LPARAM)shfi.hIcon; 915 924 … … 1489 1498 return RegisterClassEx(&wcl); 1490 1499 } 1500 1501 #ifndef AB_TEST 1502 1491 1503 int PASCAL WinMain(HINSTANCE hThisInst,HINSTANCE,LPSTR lpCmdLine,int ShowCmd){ 1492 1504 #ifdef _DEBUG … … 1540 1552 //return 0; 1541 1553 1542 1543 hAccel=LoadAccelerators(hResInst,MAKEINTRESOURCE(IDR_ACCELERATOR1)); 1554 hAccel = ActiveBasic::Resource::LoadAcceleratorsAlt(hResInst, IDR_ACCELERATOR1); 1544 1555 1545 1556 //メインウィンドウ … … 1644 1655 return static_cast<int>(msg.wParam); 1645 1656 } 1657 1658 #endif -
trunk/ab5.0/abdev/abdev/abdev.h
r629 r828 5 5 6 6 #ifdef THETEXT 7 LPSTR DefFileFilter="テキスト ファイル(*.txt)\0*.txt\0HTMLファイル(*.htm;*html)\0*.htm;*html\0CGIファイル(*.cgi;*.pl)\0*.cgi;*.pl\0PHPファイル(*.php)\0*.php\0テンプレート ファイル(*.tpl)\0*.tpl\0すべてのファイル(*.*)\0*\0\0";7 extern const LPCSTR DefFileFilter="テキスト ファイル(*.txt)\0*.txt\0HTMLファイル(*.htm;*html)\0*.htm;*html\0CGIファイル(*.cgi;*.pl)\0*.cgi;*.pl\0PHPファイル(*.php)\0*.php\0テンプレート ファイル(*.tpl)\0*.tpl\0すべてのファイル(*.*)\0*\0\0"; 8 8 #else 9 LPSTR DefFileFilter="プログラム ファイル(*.ab;*.abp;*.bas;*.sbp)\0*.ab;*.abp;*.bas;*sbp\0プロジェクト(*.pj)\0*.pj\0テキスト ファイル(*.txt)\0*.txt\0すべてのファイル(*.*)\0*\0\0";9 extern const LPCSTR DefFileFilter="プログラム ファイル(*.ab;*.abp;*.bas;*.sbp)\0*.ab;*.abp;*.bas;*sbp\0プロジェクト(*.pj)\0*.pj\0テキスト ファイル(*.txt)\0*.txt\0すべてのファイル(*.*)\0*\0\0"; 10 10 #endif 11 11 12 LPSTR HtmlFileFilter="HTMLファイル(*.html;*.htm)\0*.html;*.htm\0すべてのファイル(*.*)\0*\0\0";13 LPSTR TextFileFilter="テキスト ファイル(*.txt)\0*.txt\0すべてのファイル(*.*)\0*\0\0";12 extern const LPCSTR HtmlFileFilter="HTMLファイル(*.html;*.htm)\0*.html;*.htm\0すべてのファイル(*.*)\0*\0\0"; 13 extern const LPCSTR TextFileFilter="テキスト ファイル(*.txt)\0*.txt\0すべてのファイル(*.*)\0*\0\0"; 14 14 15 LPSTR ProjectFileFilter="プロジェクト(*.pj)\0*.pj\0\0";16 LPSTR BitmapFileFilter="ビットマップ(*.bmp)\0*.bmp\0\0";17 LPSTR IconFileFilter="アイコン(*.ico)\0*.ico\0\0";18 LPSTR CursorFileFilter="カーソル(*.cur)\0*.cur\0\0";15 extern const LPCSTR ProjectFileFilter="プロジェクト(*.pj)\0*.pj\0\0"; 16 extern const LPCSTR BitmapFileFilter="ビットマップ(*.bmp)\0*.bmp\0\0"; 17 extern const LPCSTR IconFileFilter="アイコン(*.ico)\0*.ico\0\0"; 18 extern const LPCSTR CursorFileFilter="カーソル(*.cur)\0*.cur\0\0"; 19 19 20 LPSTR ExeFileFilter="実行可能ファイル(*.exe)\0*.exe\0\0";20 extern const LPCSTR ExeFileFilter="実行可能ファイル(*.exe)\0*.exe\0\0"; 21 21 22 22 #else 23 23 //英語 24 LPSTR DefFileFilter="Program files (*.ab;*.abp;*.bas;*.sbp)\0*.ab;*.abp;*.bas;*sbp\0Project templates (*.pj)\0*.pj\0Text files (*.txt)\0*.txt\0All files(*.*)\0*\0\0";25 LPSTR ProjectFileFilter="Project templates (*.pj)\0*.pj\0\0";26 LPSTR BitmapFileFilter="Bitmap files (*.bmp)\0*.bmp\0\0";27 LPSTR IconFileFilter="Icon files (*.ico)\0*.ico\0\0";28 LPSTR CursorFileFilter="Cursor files (*.cur)\0*.cur\0\0";24 extern const LPCSTR DefFileFilter="Program files (*.ab;*.abp;*.bas;*.sbp)\0*.ab;*.abp;*.bas;*sbp\0Project templates (*.pj)\0*.pj\0Text files (*.txt)\0*.txt\0All files(*.*)\0*\0\0"; 25 extern const LPCSTR ProjectFileFilter="Project templates (*.pj)\0*.pj\0\0"; 26 extern const LPCSTR BitmapFileFilter="Bitmap files (*.bmp)\0*.bmp\0\0"; 27 extern const LPCSTR IconFileFilter="Icon files (*.ico)\0*.ico\0\0"; 28 extern const LPCSTR CursorFileFilter="Cursor files (*.cur)\0*.cur\0\0"; 29 29 #endif 30 30 -
trunk/ab5.0/abdev/abdev/include/MainFrame.h
r824 r828 27 27 WindowAreaManager wam; 28 28 UINT TaskbarButtonCreated; 29 boost::shared_ptr<TaskbarList> taskbarList;29 std::shared_ptr<TaskbarList> taskbarList; 30 30 31 31 public: … … 295 295 MSG_WM_DROPFILES( OnDropFiles ) 296 296 MSG_WM_PAINT( OnPaint ) 297 MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine ) 297 MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine ) 298 298 MESSAGE_HANDLER_EX( TaskbarButtonCreated, OnTaskbarButtonCreated ) 299 299 COMMAND_ID_HANDLER_EX( IDM_NEW, OnCmdNew ) -
trunk/ab5.0/abdev/abdev/manifest.xml
r3 r828 1 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 2 3 2 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 4 <description>Description</description> 5 <dependency> 6 <dependentAssembly> 7 <assemblyIdentity 8 type="win32" 9 name="Microsoft.Windows.Common-Controls" 10 version="6.0.0.0" 11 processorArchitecture="x86" 12 publicKeyToken="6595b64144ccf1df" 13 language="*" /> 14 </dependentAssembly> 15 </dependency> 3 <assemblyIdentity 4 version="1.0.0.0" 5 processorArchitecture="x86" 6 name="Discoversoft.ActiveBasic.ProjectEditor" 7 type="win32"/> 8 <description>ActiveBasic IDE</description> 16 9 </assembly> -
trunk/ab5.0/abdev/abdev/src/MainFrame.cpp
r824 r828 55 55 wndTarget(hwndTarget) 56 56 { 57 DWORD const WS_EX_NOACTIVATE = 0x08000000; 58 57 59 HWND hwndDummy = Create( hOwner, CRect( -32000, -32000, 1, 1 ), title, 58 60 WS_BORDER | WS_SYSMENU | WS_CAPTION, WS_EX_NOACTIVATE); … … 292 294 if (taskbarList) 293 295 { 294 taskbarList->SetTabOrder(*mapAt(hwndChild),295 hwndInsertBefore296 ? static_cast<HWND>(*mapAt(hwndInsertBefore))297 : 0);296 taskbarList->SetTabOrder(*mapAt(hwndChild), 297 hwndInsertBefore 298 ? static_cast<HWND>(*mapAt(hwndInsertBefore)) 299 : 0); 298 300 } 299 301 } … … 976 978 char temporary[MAX_PATH]; 977 979 978 FileType =DialogBox(hResInst,MAKEINTRESOURCE(IDD_NEWFILE),hOwner,DlgNewFile);980 FileType = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_NEWFILE, hOwner, DlgNewFile); 979 981 if(FileType==-1) return; 980 982 … … 1023 1025 { 1024 1026 //"ファイルを指定してください" 1025 extern LPSTR DefFileFilter;1027 extern const LPCSTR DefFileFilter; 1026 1028 char temporary[1024]; 1027 1029 if(!GetFilePathDialog(m_hWnd,temporary,DefFileFilter,STRING_FILEOPENTITLE_DEFAULT,TRUE)) return; … … 1039 1041 { 1040 1042 //"プロジェクト ファイルを指定して下さい" 1041 extern LPSTR ProjectFileFilter;1043 extern const LPCSTR ProjectFileFilter; 1042 1044 char temporary[1024]; 1043 1045 if(!GetFilePathDialog(m_hWnd,temporary,ProjectFileFilter,STRING_FILEOPENTITLE_PROJECT,TRUE)) … … 1072 1074 { 1073 1075 //"保存先のファイルを指定してください" 1074 extern LPSTR DefFileFilter;1076 extern const LPCSTR DefFileFilter; 1075 1077 char temporary[1024]; 1076 1078 if(!GetFilePathDialog(m_hWnd,temporary,DefFileFilter,STRING_FILESAVETITLE_DEFAULT,FALSE)) return; … … 1367 1369 void MainFrame::OnCmdFind( UINT uNotifyCode, int nID, CWindow wndCtl ) 1368 1370 { 1369 DialogBox(hResInst,MAKEINTRESOURCE(IDD_FIND),m_hWnd,DlgFind);1371 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_FIND, m_hWnd, DlgFind); 1370 1372 } 1371 1373 1372 1374 void MainFrame::OnCmdPermutation( UINT uNotifyCode, int nID, CWindow wndCtl ) 1373 1375 { 1374 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),m_hWnd,DlgPermutation);1376 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PERMUTATION, m_hWnd, DlgPermutation); 1375 1377 } 1376 1378 … … 1627 1629 int idProcess; 1628 1630 DWORD dwPlatform; 1629 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)); 1630 1632 if(idProcess==0) return; 1631 1633 … … 1889 1891 void MainFrame::OnCmdAbout( UINT uNotifyCode, int nID, CWindow wndCtl ) 1890 1892 { 1891 DialogBox(hResInst,MAKEINTRESOURCE(IDD_ABOUT),m_hWnd,DialogAbout);1893 ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ABOUT, m_hWnd, DialogAbout); 1892 1894 } 1893 1895 -
trunk/ab5.0/abdev/abdev/stdafx.h
r772 r828 1 1 #pragma once 2 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 13 2 4 3 #include <map> … … 26 25 #include <atlcom.h> 27 26 #include <atlhost.h> 27 #undef _SECURE_ATL 28 #define _SECURE_ATL 1 29 #pragma warning(push) 30 #pragma warning(disable: 6011 6246 6255 6269 6387) 28 31 #include <atlapp.h> 29 32 #include <atlframe.h> … … 31 34 #include <atlmisc.h> 32 35 #include <atlctrls.h> 36 #pragma warning(pop) 33 37 34 38 //boost libraries … … 40 44 41 45 // tinyxml 46 #pragma warning(push) 47 #pragma warning(disable: 6011) 42 48 #include <tinyxml/tinyxml.h> 49 #pragma warning(pop) 43 50 44 51 #include <jenga/include/jenga.h>
Note:
See TracChangeset
for help on using the changeset viewer.