Changeset 763 in dev
- Timestamp:
- Nov 6, 2008, 10:22:26 PM (16 years ago)
- Location:
- trunk/ab5.0
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp
r750 r763 10 10 11 11 using namespace ActiveBasic::Compiler; 12 13 HRESULT ApplyDialogTexture( HWND ); 12 14 13 15 //変数リストのツリーハンドル … … 890 892 SendMessage(hDebuggerToolbar, TB_SETDISABLEDIMAGELIST, 0, (LPARAM)hImageList_Disabled); 891 893 894 ApplyDialogTexture(hwnd); 892 895 break; 893 896 case WM_COMMAND: … … 1011 1014 } 1012 1015 1013 BOOLCALLBACK DlgDebugger(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1016 INT_PTR CALLBACK DlgDebugger(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1014 1017 extern HANDLE hHeap; 1015 1018 extern HINSTANCE hInst; … … 1046 1049 1047 1050 extern WNDPROC OldThreadComboProc; 1048 OldThreadComboProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hwnd,IDC_THREADCOMBO),GWLP_WNDPROC); 1049 SetWindowLongPtr(GetDlgItem(hwnd,IDC_THREADCOMBO),GWLP_WNDPROC,(LONG_PTR)ThreadComboProc); 1051 OldThreadComboProc=(WNDPROC)SetWindowLongPtr(GetDlgItem(hwnd,IDC_THREADCOMBO),GWLP_WNDPROC,(LONG_PTR)ThreadComboProc); 1050 1052 1051 1053 extern WNDPROC OldProcComboProc; 1052 OldProcComboProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hwnd,IDC_PROCCOMBO),GWLP_WNDPROC); 1053 SetWindowLongPtr(GetDlgItem(hwnd,IDC_PROCCOMBO),GWLP_WNDPROC,(LONG_PTR)ProcComboProc); 1054 OldProcComboProc=(WNDPROC)SetWindowLongPtr(GetDlgItem(hwnd,IDC_PROCCOMBO),GWLP_WNDPROC,(LONG_PTR)ProcComboProc); 1054 1055 1055 1056 … … 1065 1066 0,0,0,0,hwnd,0,hInst,0); 1066 1067 SendMessage(hTab,WM_SETFONT,(WPARAM)hFont,0); 1067 OldTabProc=(WNDPROC)GetWindowLongPtr(hTab,GWLP_WNDPROC); 1068 SetWindowLongPtr(hTab,GWLP_WNDPROC,(LONG_PTR)TabProc); 1068 OldTabProc=(WNDPROC)SetWindowLongPtr(hTab,GWLP_WNDPROC,(LONG_PTR)TabProc); 1069 1069 1070 1070 //タブを設定 … … 1162 1162 InitVarList((DWORD)lParam); 1163 1163 1164 ApplyDialogTexture(hwnd); 1164 1165 break; 1165 1166 case WM_NOTIFY: … … 1356 1357 ////////////////////////////////// 1357 1358 1358 BOOLCALLBACK DlgVarList(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1359 INT_PTR CALLBACK DlgVarList(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1359 1360 extern HINSTANCE hInst; 1360 1361 extern DWORD dwStepRun; … … 1393 1394 1394 1395 InitVarList((DWORD)lParam); 1396 1397 ApplyDialogTexture(hwnd); 1398 1395 1399 break; 1396 1400 case WM_COMMAND: -
trunk/ab5.0/abdev/ab_common/src/Environment.cpp
r751 r763 1 1 #include "stdafx.h" 2 #include <uxtheme.h> 2 3 3 4 std::string ActiveBasic::Common::Environment::rootPath; … … 36 37 } 37 38 39 BOOL EnableLFH(HANDLE hHeap) 40 { 41 ULONG enableLFH = 2; 42 return HeapSetInformation(hHeap, HeapCompatibilityInformation, &enableLFH, sizeof enableLFH); 43 } 44 38 45 void* operator new( std::size_t n ) 39 46 { … … 60 67 ::operator delete( p ); 61 68 } 69 70 typedef HRESULT (WINAPI* PFN_EnableThemeDialogTexture)(HWND, DWORD); 71 72 HMODULE hmodUxTheme = LoadLibrary("uxtheme"); 73 74 HRESULT ApplyDialogTexture( HWND hwnd ) 75 { 76 if( hmodUxTheme ) 77 { 78 if( PFN_EnableThemeDialogTexture pfn = reinterpret_cast<PFN_EnableThemeDialogTexture>( 79 GetProcAddress(hmodUxTheme, "EnableThemeDialogTexture")) ) 80 { 81 return pfn(hwnd, ETDT_ENABLETAB); 82 } 83 } 84 return E_NOTIMPL; 85 } -
trunk/ab5.0/abdev/ab_common/stdafx.h
r750 r763 11 11 #include <stdio.h> 12 12 #include <string.h> 13 #include <stdlib.h> 13 14 #include <math.h> 14 15 #include <time.h> 15 16 #include <limits.h> 16 17 #include <shlobj.h> 18 #include <assert.h> 17 19 18 20 //boost libraries -
trunk/ab5.0/abdev/abdev/Attach.cpp
r477 r763 10 10 11 11 using namespace ActiveBasic::IDE; 12 13 HRESULT ApplyDialogTexture( HWND ); 12 14 13 15 … … 241 243 } 242 244 243 BOOLCALLBACK DlgAttach(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){245 INT_PTR CALLBACK DlgAttach(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 244 246 static HWND hListView; 245 247 static HIMAGELIST hImageList; … … 298 300 else ListupProcesses(hListView); 299 301 302 ApplyDialogTexture(hwnd); 300 303 break; 301 304 case WM_COMMAND: -
trunk/ab5.0/abdev/abdev/Attach.h
r3 r763 1 1 2 BOOLCALLBACK DlgAttach(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);2 INT_PTR CALLBACK DlgAttach(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam); -
trunk/ab5.0/abdev/abdev/DialogBoxes.cpp
r761 r763 2 2 3 3 #include "Common.h" 4 5 HRESULT ApplyDialogTexture( HWND ); 4 6 5 7 //タブ用 … … 319 321 LPPSHNOTIFY lpPshNotify; 320 322 switch(message){ 321 case WM_INITDIALOG:322 323 break;324 323 case WM_NOTIFY: 325 324 lpPshNotify=(LPPSHNOTIFY)lParam; … … 391 390 SendDlgItemMessage(hwnd,IDC_EXE_WINDOWBASE,BM_SETCHECK,BST_CHECKED,0); 392 391 SetDlgItemText(hwnd,IDC_HELPTEXT_OFBASE,TEXT_BASE_NORMAL); 392 393 393 break; 394 394 case WM_COMMAND: … … 514 514 i=0; 515 515 psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE1); 516 psp.pfnDlgProc= (DLGPROC)DlgNewProject_Page1;516 psp.pfnDlgProc=DlgNewProject_Page1; 517 517 hpsp[i]=CreatePropertySheetPage(&psp); 518 518 i++; 519 519 psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE2); 520 psp.pfnDlgProc= (DLGPROC)DlgNewProject_Page2;520 psp.pfnDlgProc=DlgNewProject_Page2; 521 521 hpsp[i]=CreatePropertySheetPage(&psp); 522 522 i++; 523 523 psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE3); 524 psp.pfnDlgProc= (DLGPROC)DlgNewProject_Page3;524 psp.pfnDlgProc=DlgNewProject_Page3; 525 525 hpsp[i]=CreatePropertySheetPage(&psp); 526 526 … … 646 646 647 647 SendMessage(hwnd,WM_COMMAND,IDC_ADDTOPROJECT,0); 648 649 ApplyDialogTexture(hwnd); 648 650 break; 649 651 case WM_COMMAND: … … 815 817 SendDlgItemMessage(hwnd,IDC_UNICODE,BM_SETCHECK,BST_CHECKED,0); 816 818 819 ApplyDialogTexture(hwnd); 817 820 break; 818 821 case WM_NOTIFY: … … 848 851 if(temp_dwPjOption&PJ_OP_WINSOCK) 849 852 SendDlgItemMessage(hwnd,IDC_API_WINSOCK,BM_SETCHECK,BST_CHECKED,0); 853 854 ApplyDialogTexture(hwnd); 850 855 break; 851 856 case WM_NOTIFY: … … 885 890 SendMessage(hwnd,WM_COMMAND,IDC_RC_MANIFEST,0); 886 891 892 ApplyDialogTexture(hwnd); 887 893 break; 888 894 case WM_COMMAND: … … 936 942 SetDlgItemText(hwnd,IDC_EXE_PATH,projectInfo.szExePath); 937 943 944 ApplyDialogTexture(hwnd); 938 945 break; 939 946 case WM_COMMAND: … … 2035 2042 SetDlgItemText(hwnd,IDC_DEV_GROUP,temporary); 2036 2043 #endif 2044 ApplyDialogTexture(hwnd); 2037 2045 } 2038 2046 if(message==WM_COMMAND){ -
trunk/ab5.0/abdev/abdev/IconEditor_Tool.cpp
r629 r763 2 2 3 3 #include "common.h" 4 5 HRESULT ApplyDialogTexture( HWND ); 4 6 5 7 char *GetIconEditToolName(DWORD id){ … … 31 33 } 32 34 33 BOOLCALLBACK DlgIconButtons(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){35 INT_PTR CALLBACK DlgIconButtons(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 34 36 int WndNum; 35 37 RECT rect; … … 63 65 PostMessage(hwnd,WM_USER+120,0,0); 64 66 67 ApplyDialogTexture(hwnd); 65 68 break; 66 69 case WM_USER+120: … … 103 106 return 0; 104 107 } 105 BOOLCALLBACK DlgIconType(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){108 INT_PTR CALLBACK DlgIconType(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 106 109 int i,WndNum; 107 110 HWND hList; … … 139 142 //"16*16 (16色)" 140 143 sprintf(temporary,"16*16 (16%s)",STRING_UNIT_COLORS); 141 SendMessage(hList,LB_ADDSTRING,0,( long)temporary);144 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)temporary); 142 145 } 143 146 if(bExist[1]==0){ 144 147 //"16*16 (256色)" 145 148 sprintf(temporary,"16*16 (256%s)",STRING_UNIT_COLORS); 146 SendMessage(hList,LB_ADDSTRING,0,( long)temporary);149 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)temporary); 147 150 } 148 151 if(bExist[2]==0){ 149 152 //"32*32 (16色)" 150 153 sprintf(temporary,"32*32 (16%s)",STRING_UNIT_COLORS); 151 SendMessage(hList,LB_ADDSTRING,0,( long)temporary);154 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)temporary); 152 155 } 153 156 if(bExist[3]==0){ 154 157 //"32*32 (256色)" 155 158 sprintf(temporary,"32*32 (256%s)",STRING_UNIT_COLORS); 156 SendMessage(hList,LB_ADDSTRING,0,(long)temporary); 157 } 159 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)temporary); 160 } 161 ApplyDialogTexture(hwnd); 158 162 break; 159 163 case WM_COMMAND: … … 161 165 case IDOK: 162 166 hList=GetDlgItem(hwnd,IDC_TYPELIST); 163 SendMessage(hList,LB_GETTEXT,SendMessage(hList,LB_GETCURSEL,0,0),( long)temporary);167 SendMessage(hList,LB_GETTEXT,SendMessage(hList,LB_GETCURSEL,0,0),(LPARAM)temporary); 164 168 165 169 if(temporary[0]=='1'&&temporary[7]=='1') i=ICONTYPE_16_16; … … 177 181 return 0; 178 182 } 179 BOOLCALLBACK DlgIconToolProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){183 INT_PTR CALLBACK DlgIconToolProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 180 184 int i,WndNum; 181 185 … … 184 188 switch(LOWORD(wParam)){ 185 189 case IDC_ADD_ICONTYPE: 186 i=DialogBox(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_ICONTYPE),GetParent(hwnd), (DLGPROC)DlgIconType);190 i=DialogBox(hResInst,MAKEINTRESOURCE(IDD_ICONEDIT_ICONTYPE),GetParent(hwnd),DlgIconType); 187 191 if(i==-1) return 1; 188 192 -
trunk/ab5.0/abdev/abdev/MessageCallOperation.cpp
r629 r763 2 2 3 3 #include "Common.h" 4 5 HRESULT ApplyDialogTexture( HWND ); 4 6 5 7 //////////////////////////////////////////////////////////////////////////// … … 586 588 return CallWindowProc(OldEventListViewProc,hwnd,message,wParam,lParam); 587 589 } 588 BOOLCALLBACK DlgEventCode(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){590 INT_PTR CALLBACK DlgEventCode(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 589 591 int WndNum,WndInfoNum,i,i2; 590 592 char temporary[MAX_PATH],temp2[MAX_PATH]; … … 643 645 EnableWindow(GetDlgItem(hwnd,IDOK),0); 644 646 645 OldEventListViewProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hwnd,IDC_EVENTLIST),GWLP_WNDPROC); 646 SetWindowLongPtr(GetDlgItem(hwnd,IDC_EVENTLIST),GWLP_WNDPROC,(long)EventListViewProc); 647 OldEventListViewProc=(WNDPROC)SetWindowLongPtr(GetDlgItem(hwnd,IDC_EVENTLIST),GWLP_WNDPROC,(LPARAM)EventListViewProc); 647 648 648 649 { … … 651 652 NowMenuNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str()); 652 653 } 654 ApplyDialogTexture(hwnd); 653 655 break; 654 656 case WM_COMMAND: -
trunk/ab5.0/abdev/abdev/Print.cpp
r629 r763 3 3 #include "common.h" 4 4 5 HRESULT ApplyDialogTexture( HWND ); 5 6 6 7 int iPreviewNowPage; … … 391 392 return DefWindowProc(hwnd,message,wParam,lParam); 392 393 } 393 BOOLCALLBACK DlgPreview(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){394 INT_PTR CALLBACK DlgPreview(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 394 395 static HWND hPreview; 395 396 char temporary[255]; … … 430 431 SendMessage(hPreview,WM_RESETPREVIEW,0,0); 431 432 433 ApplyDialogTexture(hwnd); 432 434 break; 433 435 case WM_COMMAND: … … 520 522 521 523 void Preview(void){ 522 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PREVIEW),hOwner, (DLGPROC)DlgPreview);524 DialogBox(hResInst,MAKEINTRESOURCE(IDD_PREVIEW),hOwner,DlgPreview); 523 525 } 524 526 -
trunk/ab5.0/abdev/abdev/RadSupport.cpp
r629 r763 10 10 #include "rad_msg_eng.h" 11 11 #endif 12 13 HRESULT ApplyDialogTexture( HWND ); 12 14 13 15 int bSupportDlg_NoChange; … … 266 268 } 267 269 268 BOOLCALLBACK DlgRadSupport(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){270 INT_PTR CALLBACK DlgRadSupport(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 269 271 static BOOL bTimer; 270 272 int i,i3; … … 275 277 switch(message){ 276 278 case WM_INITDIALOG: 277 SendDlgItemMessage(hwnd,IDC_SPIN1,UDM_SETBUDDY,( long)GetDlgItem(hwnd,IDC_XPOS),0);278 SendDlgItemMessage(hwnd,IDC_SPIN2,UDM_SETBUDDY,( long)GetDlgItem(hwnd,IDC_YPOS),0);279 SendDlgItemMessage(hwnd,IDC_SPIN3,UDM_SETBUDDY,( long)GetDlgItem(hwnd,IDC_WIDTH),0);280 SendDlgItemMessage(hwnd,IDC_SPIN4,UDM_SETBUDDY,( long)GetDlgItem(hwnd,IDC_HEIGHT),0);279 SendDlgItemMessage(hwnd,IDC_SPIN1,UDM_SETBUDDY,(LONG_PTR)GetDlgItem(hwnd,IDC_XPOS),0); 280 SendDlgItemMessage(hwnd,IDC_SPIN2,UDM_SETBUDDY,(LONG_PTR)GetDlgItem(hwnd,IDC_YPOS),0); 281 SendDlgItemMessage(hwnd,IDC_SPIN3,UDM_SETBUDDY,(LONG_PTR)GetDlgItem(hwnd,IDC_WIDTH),0); 282 SendDlgItemMessage(hwnd,IDC_SPIN4,UDM_SETBUDDY,(LONG_PTR)GetDlgItem(hwnd,IDC_HEIGHT),0); 281 283 282 284 SendDlgItemMessage(hwnd,IDC_SPIN1,UDM_SETRANGE32,0,0x7FFF); … … 284 286 SendDlgItemMessage(hwnd,IDC_SPIN3,UDM_SETRANGE32,0,0x7FFF); 285 287 SendDlgItemMessage(hwnd,IDC_SPIN4,UDM_SETRANGE32,0,0x7FFF); 288 289 ApplyDialogTexture(hwnd); 286 290 return 0; 287 291 case WM_COMMAND: -
trunk/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp
r629 r763 10 10 #include "rad_msg_eng.h" 11 11 #endif 12 13 HRESULT ApplyDialogTexture( HWND ); 12 14 13 15 void ShowControlAdvice(int Control){ … … 99 101 return pTemp; 100 102 } 101 BOOLCALLBACK RadToolButtonsProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){103 INT_PTR CALLBACK RadToolButtonsProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 102 104 int i,i2,WndNum; 103 105 HWND hParent; … … 140 142 PostMessage(hwnd,WM_USER+120,0,0); 141 143 144 ApplyDialogTexture(hwnd); 142 145 break; 143 146 case WM_USER+120: … … 347 350 RadProperty_Window_Border_StylingOrder(hwnd,style); 348 351 } 349 BOOLCALLBACK DlgRadProperty_Window_Rename(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){352 INT_PTR CALLBACK DlgRadProperty_Window_Rename(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 350 353 extern HANDLE hHeap; 351 354 extern HWND hClient,hOwner; … … 361 364 SetDlgItemText(hwnd,IDC_WINDOWHANDLE,( "h" + pWindowInfo->GetName() ).c_str()); 362 365 SetDlgItemText(hwnd,IDC_WINDOWPROC,( pWindowInfo->GetName() + "Proc" ).c_str()); 366 ApplyDialogTexture(hwnd); 363 367 break; 364 368 } … … 434 438 return 0; 435 439 } 436 BOOLCALLBACK DlgRadProperty_Window_ExStyle(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){440 INT_PTR CALLBACK DlgRadProperty_Window_ExStyle(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 437 441 int i; 438 442 … … 452 456 if(pWindowInfo->GetExStyle()&WS_EX_CONTEXTHELP) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTEXTHELP,BM_SETCHECK,BST_CHECKED,0); 453 457 if(pWindowInfo->GetExStyle()&WS_EX_CONTROLPARENT) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CONTROLPARENT,BM_SETCHECK,BST_CHECKED,0); 458 ApplyDialogTexture(hwnd); 454 459 break; 455 460 } … … 503 508 return 0; 504 509 } 505 BOOLCALLBACK RadProperty_WindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){510 INT_PTR CALLBACK RadProperty_WindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 506 511 extern HANDLE hHeap; 507 512 int i,i3,i4; … … 520 525 521 526 //"3D FACE(標準)" 522 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_BGCOLOR1);527 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_BGCOLOR1); 523 528 //"色指定" 524 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_BGCOLOR2);529 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_BGCOLOR2); 525 530 526 531 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 527 532 { 528 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,( long)resourceItem.idName.c_str());533 SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(LPARAM)resourceItem.idName.c_str()); 529 534 } 530 535 if( pWindowInfo->IsModalDlg() || pWindowInfo->IsModelessDlg() ) … … 554 559 555 560 //"なし" 556 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,( long)STRING_NONE_);561 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,(LPARAM)STRING_NONE_); 557 562 558 563 for(i3=0,i4=0;i3<projectInfo.NumberOfMenu;i3++){ … … 562 567 i4=i3+1; 563 568 } 564 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,( long)projectInfo.pMenuInfo[i3].IdName);569 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,(LPARAM)projectInfo.pMenuInfo[i3].IdName); 565 570 } 566 571 if(i4==0&&pWindowInfo->HasMenu()){ … … 577 582 578 583 //"Windowsロゴ(標準)" 579 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_ICONDEFAULT);584 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_ICONDEFAULT); 580 585 581 586 for(i3=0,i4=0;i3<static_cast<int>(projectInfo.resourceManager.iconResources.size());i3++){ 582 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,( long)projectInfo.resourceManager.iconResources[i3].idName.c_str());587 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_ADDSTRING,0,(LPARAM)projectInfo.resourceManager.iconResources[i3].idName.c_str()); 583 588 584 589 if( pWindowInfo->HasIcon() ) … … 604 609 605 610 //"オーバーラップ" 606 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_STYLE_OVERLAPPED);611 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_STYLE_OVERLAPPED); 607 612 //"ポップアップ" 608 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_STYLE_POPUP);613 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_STYLE_POPUP); 609 614 //"チャイルド" 610 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_STYLE_CHILD);615 SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_STYLE_CHILD); 611 616 612 617 if(pWindowInfo->GetStyle()&WS_POPUP) SendDlgItemMessage(hwnd,IDC_WINDOWSTYLE,CB_SETCURSEL,1,0); … … 615 620 616 621 //"枠なし" 617 SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_STYLE_FRAME_NONE);622 SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_STYLE_FRAME_NONE); 618 623 //"細枠" 619 SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_STYLE_FRAME_THICK);624 SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_STYLE_FRAME_THICK); 620 625 //"サイズ変更枠" 621 SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_ADDSTRING,0,( long)STRING_WINDOWPROP_STYLE_FRAME_BORDER);626 SendDlgItemMessage(hwnd,IDC_BORDERSTYLE,CB_ADDSTRING,0,(LPARAM)STRING_WINDOWPROP_STYLE_FRAME_BORDER); 622 627 623 628 //WS_CAPTION(WS_BORDER含む)を考慮してWS_THICKFRAMEを最初に比較する … … 667 672 668 673 bInitial=0; 674 ApplyDialogTexture(hwnd); 669 675 break; 670 676 } … … 673 679 case IDC_RENAMEWINDOW: 674 680 { 675 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd, (DLGPROC)DlgRadProperty_Window_Rename)) return 1;681 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_RENAME),hwnd,DlgRadProperty_Window_Rename)) return 1; 676 682 i=GetWndNum(GetParent(GetParent(hwnd))); 677 683 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path); … … 682 688 case IDC_RENAMECAPTION: 683 689 { 684 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd, (DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1;690 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,DlgRadProperty_Item_RenameCaption)) return 1; 685 691 i=GetWndNum(GetParent(GetParent(hwnd))); 686 692 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path); … … 796 802 { 797 803 char temporary[1024]; 798 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXT,i3,( long)temporary);804 SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_GETLBTEXT,i3,(LPARAM)temporary); 799 805 pWindowInfo->SetMenuIdName( temporary ); 800 806 } … … 819 825 { 820 826 char temporary[1024]; 821 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXT,i3,( long)temporary);827 SendDlgItemMessage(hwnd,IDC_ICONRES,CB_GETLBTEXT,i3,(LPARAM)temporary); 822 828 pWindowInfo->SetIconResourceName( temporary ); 823 829 } … … 1067 1073 1068 1074 case IDC_EXSTYLE: 1069 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Window_ExStyle)) return 1;1075 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW_EXSTYLE),hwnd,DlgRadProperty_Window_ExStyle)) return 1; 1070 1076 i=GetWndNum(GetParent(GetParent(hwnd))); 1071 1077 DrawRadWindow(i,GetWndInfo(MdiInfo[i]->path)); … … 1103 1109 } 1104 1110 1105 BOOLCALLBACK DlgRadProperty_Item_RenameCaption(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1111 INT_PTR CALLBACK DlgRadProperty_Item_RenameCaption(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1106 1112 extern HANDLE hHeap; 1107 1113 int i,i3; … … 1119 1125 else 1120 1126 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1127 ApplyDialogTexture(hwnd); 1121 1128 break; 1122 1129 } … … 1234 1241 return 0; 1235 1242 } 1236 BOOLCALLBACK DlgRadProperty_Item_RenameID(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1243 INT_PTR CALLBACK DlgRadProperty_Item_RenameID(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1237 1244 extern HANDLE hHeap; 1238 1245 extern HWND hClient,hOwner; … … 1247 1254 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i]->path); 1248 1255 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1256 ApplyDialogTexture(hwnd); 1249 1257 } 1250 1258 break; … … 1297 1305 switch(LOWORD(wParam)){ 1298 1306 case IDC_RENAMEID: 1299 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd, (DLGPROC)DlgRadProperty_Item_RenameID)) return 1;1307 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMEID),hwnd,DlgRadProperty_Item_RenameID)) return 1; 1300 1308 SetDlgItemText(hwnd,IDC_IDNAME,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1301 1309 return 1; 1302 1310 case IDC_RENAMECAPTION: 1303 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd, (DLGPROC)DlgRadProperty_Item_RenameCaption)) return 1;1311 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_RENAMECAPTION),hwnd,DlgRadProperty_Item_RenameCaption)) return 1; 1304 1312 SetDlgItemText(hwnd,IDC_CAPTION,pWindowInfo->childWindowInfos[MdiInfo[WndNum]->MdiRadInfo->SelectingItem[0]]->GetCaption().c_str()); 1305 1313 return 1; … … 1356 1364 return 0; 1357 1365 } 1358 BOOLCALLBACK DlgRadProperty_Item_ExStyle(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1366 INT_PTR CALLBACK DlgRadProperty_Item_ExStyle(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1359 1367 int i; 1360 1368 … … 1370 1378 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_CLIENTEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_CLIENTEDGE,BM_SETCHECK,BST_CHECKED,0); 1371 1379 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetExStyle()&WS_EX_STATICEDGE) SendDlgItemMessage(hwnd,IDC_EXSTYLE_STATICEDGE,BM_SETCHECK,BST_CHECKED,0); 1380 ApplyDialogTexture(hwnd); 1372 1381 break; 1373 1382 } … … 1417 1426 // BUTTON プロパティ 1418 1427 1419 BOOLCALLBACK RadProperty_ButtonProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1428 INT_PTR CALLBACK RadProperty_ButtonProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1420 1429 int i,i2,i3; 1421 1430 static BOOL bInitial; … … 1454 1463 1455 1464 //"デフォルト" 1456 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_DEFAULT);1465 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_DEFAULT); 1457 1466 //"左端" 1458 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_LEFT);1467 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_LEFT); 1459 1468 //"右端" 1460 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_RIGHT);1469 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_RIGHT); 1461 1470 //"中央" 1462 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_CENTER);1471 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_CENTER); 1463 1472 1464 1473 //ビットを考慮してBS_CENTERを最初に比較する … … 1474 1483 1475 1484 //"デフォルト" 1476 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_DEFAULT);1485 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_DEFAULT); 1477 1486 //"上端" 1478 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_TOP);1487 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_TOP); 1479 1488 //"下端" 1480 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_BOTTOM);1489 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_BOTTOM); 1481 1490 //"中央" 1482 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_CENTER);1491 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LONG_PTR)STRING_CENTER); 1483 1492 1484 1493 //ビットを考慮してBS_VCENTERを最初に比較する … … 1488 1497 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0); 1489 1498 1490 1491 1499 bInitial=0; 1500 ApplyDialogTexture(hwnd); 1492 1501 break; 1493 1502 } … … 1625 1634 1626 1635 case IDC_EXSTYLE: 1627 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;1636 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 1628 1637 DrawRadWindow(i,pWindowInfo); 1629 1638 return 1; … … 1638 1647 //////////////////////// 1639 1648 // CHECKBOX プロパティ 1640 BOOLCALLBACK RadProperty_CheckBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1649 INT_PTR CALLBACK RadProperty_CheckBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1641 1650 int i,i2,i3; 1642 1651 static BOOL bInitial; … … 1680 1689 1681 1690 //"デフォルト" 1682 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_DEFAULT);1691 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_DEFAULT); 1683 1692 //"左端" 1684 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_LEFT);1693 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_LEFT); 1685 1694 //"右端" 1686 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_RIGHT);1695 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_RIGHT); 1687 1696 //"中央" 1688 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_CENTER);1697 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_CENTER); 1689 1698 1690 1699 //ビットを考慮してBS_CENTERを最初に比較する … … 1700 1709 1701 1710 //"デフォルト" 1702 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_DEFAULT);1711 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_DEFAULT); 1703 1712 //"上端" 1704 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_TOP);1713 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_TOP); 1705 1714 //"下端" 1706 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_BOTTOM);1715 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_BOTTOM); 1707 1716 //"中央" 1708 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_CENTER);1717 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_CENTER); 1709 1718 1710 1719 //ビットを考慮してBS_VCENTERを最初に比較する … … 1714 1723 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0); 1715 1724 1716 1725 ApplyDialogTexture(hwnd); 1717 1726 bInitial=0; 1718 1727 break; … … 1907 1916 1908 1917 case IDC_EXSTYLE: 1909 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;1918 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 1910 1919 DrawRadWindow(i,pWindowInfo); 1911 1920 return 1; … … 1928 1937 else EnableWindow(GetDlgItem(hwnd,IDC_CBS_HASSTRINGS),1); 1929 1938 } 1930 BOOLCALLBACK RadProperty_ComboBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){1939 INT_PTR CALLBACK RadProperty_ComboBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 1931 1940 int i,i2,i3; 1932 1941 static BOOL bInitial; … … 1956 1965 1957 1966 //"デフォルト" 1958 SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_ADDSTRING,0,( long)STRING_DEFAULT);1967 SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_DEFAULT); 1959 1968 //"ドロップ ダウン" 1960 SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_ADDSTRING,0,( long)STRING_COMBOBOXPROP_STYLE_DROPDOWN);1969 SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_COMBOBOXPROP_STYLE_DROPDOWN); 1961 1970 //"ドロップ ダウン リスト" 1962 SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_ADDSTRING,0,( long)STRING_COMBOBOXPROP_STYLE_DROPDOWNLIST);1971 SendDlgItemMessage(hwnd,IDC_CBS_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_COMBOBOXPROP_STYLE_DROPDOWNLIST); 1963 1972 1964 1973 //ビットを考慮してCBS_DROPDOWNLISTを最初に比較する … … 1973 1982 1974 1983 //"なし" 1975 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,( long)STRING_NONE_);1984 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(LPARAM)STRING_NONE_); 1976 1985 //"固定" 1977 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,( long)STRING_OWNERDRAW_FIXED);1986 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(LPARAM)STRING_OWNERDRAW_FIXED); 1978 1987 //"可変" 1979 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,( long)STRING_OWNERDRAW_VARIABLE);1988 SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(LPARAM)STRING_OWNERDRAW_VARIABLE); 1980 1989 1981 1990 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&CBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_SETCURSEL,1,0); … … 1997 2006 pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 1998 2007 1999 2008 ApplyDialogTexture(hwnd); 2000 2009 bInitial=0; 2001 2010 break; … … 2159 2168 2160 2169 case IDC_EXSTYLE: 2161 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;2170 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2162 2171 DrawRadWindow(i,pWindowInfo); 2163 2172 return 1; … … 2195 2204 } 2196 2205 } 2197 BOOLCALLBACK RadProperty_EditProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){2206 INT_PTR CALLBACK RadProperty_EditProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 2198 2207 int i,i2,i3; 2199 2208 static BOOL bInitial; … … 2239 2248 2240 2249 //"左端" 2241 SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_ADDSTRING,0,( long)STRING_LEFT);2250 SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_ADDSTRING,0,(LPARAM)STRING_LEFT); 2242 2251 //"中央" 2243 SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_ADDSTRING,0,( long)STRING_CENTER);2252 SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_ADDSTRING,0,(LPARAM)STRING_CENTER); 2244 2253 //"右端" 2245 SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_ADDSTRING,0,( long)STRING_RIGHT);2254 SendDlgItemMessage(hwnd,IDC_ES_TEXTPOS,CB_ADDSTRING,0,(LPARAM)STRING_RIGHT); 2246 2255 2247 2256 //ビットを考慮してES_LEFTを最後に検討する … … 2254 2263 pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 2255 2264 2256 2265 ApplyDialogTexture(hwnd); 2257 2266 bInitial=0; 2258 2267 break; … … 2466 2475 2467 2476 case IDC_EXSTYLE: 2468 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;2477 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2469 2478 DrawRadWindow(i,pWindowInfo); 2470 2479 return 1; … … 2480 2489 // GROUPBOX プロパティ 2481 2490 2482 BOOLCALLBACK RadProperty_GroupBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){2491 INT_PTR CALLBACK RadProperty_GroupBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 2483 2492 int i,i2,i3; 2484 2493 static BOOL bInitial; … … 2510 2519 2511 2520 //"デフォルト" 2512 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,( long)STRING_DEFAULT);2521 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_DEFAULT); 2513 2522 //"左端" 2514 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,( long)STRING_LEFT);2523 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_LEFT); 2515 2524 //"右端" 2516 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,( long)STRING_RIGHT);2525 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_RIGHT); 2517 2526 //"中央" 2518 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,( long)STRING_CENTER);2527 SendDlgItemMessage(hwnd,IDC_BS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_CENTER); 2519 2528 2520 2529 //ビットを考慮してBS_CENTERを最初に検討する … … 2528 2537 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&BS_NOTIFY) SendDlgItemMessage(hwnd,IDC_BS_NOTIFY,BM_SETCHECK,BST_CHECKED,0); 2529 2538 2530 2539 ApplyDialogTexture(hwnd); 2531 2540 bInitial=0; 2532 2541 break; … … 2601 2610 2602 2611 case IDC_EXSTYLE: 2603 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;2612 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 2604 2613 DrawRadWindow(i,pWindowInfo); 2605 2614 return 1; … … 2630 2639 } 2631 2640 } 2632 BOOLCALLBACK RadProperty_ImageBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){2641 INT_PTR CALLBACK RadProperty_ImageBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 2633 2642 extern HANDLE hHeap; 2634 2643 int i,i2,i3; … … 2660 2669 2661 2670 //"フレーム(黒)" 2662 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_FRAME_BLACK);2671 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_FRAME_BLACK); 2663 2672 //"フレーム(灰色)" 2664 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_FRAME_GRAY);2673 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_FRAME_GRAY); 2665 2674 //"フレーム(白)" 2666 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_FRAME_WHITE);2675 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_FRAME_WHITE); 2667 2676 //"フレーム(縁取り)" 2668 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_FRAME_ETCHED);2677 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_FRAME_ETCHED); 2669 2678 //"四角形(黒)" 2670 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_RECT_BLACK);2679 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_RECT_BLACK); 2671 2680 //"四角形(灰色)" 2672 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_RECT_GRAY);2681 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_RECT_GRAY); 2673 2682 //"四角形(白)" 2674 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_RECT_WHITE);2683 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_RECT_WHITE); 2675 2684 //"アイコン" 2676 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_ICON);2685 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_ICON); 2677 2686 //"ビットマップ" 2678 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,( long)STRING_IMAGEBOXPROP_STYLE_BITMAP);2687 SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_ADDSTRING,0,(LPARAM)STRING_IMAGEBOXPROP_STYLE_BITMAP); 2679 2688 2680 2689 if((pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&0x0000000F)==SS_BLACKFRAME) SendDlgItemMessage(hwnd,IDC_IMAGE_TYPE,CB_SETCURSEL,0,0); … … 2725 2734 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.iconResources ) 2726 2735 { 2727 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,( long)resourceItem.idName.c_str());2736 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(LPARAM)resourceItem.idName.c_str()); 2728 2737 } 2729 2738 } … … 2732 2741 BOOST_FOREACH( const ActiveBasic::Common::ResourceItem &resourceItem, projectInfo.resourceManager.bitmapResources ) 2733 2742 { 2734 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,( long)resourceItem.idName.c_str());2743 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_ADDSTRING,0,(LPARAM)resourceItem.idName.c_str()); 2735 2744 } 2736 2745 } 2737 2746 2738 2747 //リストから選択 2739 i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_FINDSTRING,0,( long)pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path.c_str());2748 i3=SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_FINDSTRING,0,(LPARAM)pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->image.path.c_str()); 2740 2749 SendDlgItemMessage(hwnd,IDC_RESCOMBO,CB_SETCURSEL,i3,0); 2741 2750 } … … 2750 2759 pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 2751 2760 2761 ApplyDialogTexture(hwnd); 2752 2762 bInitial=0; 2753 2763 break; … … 3013 3023 3014 3024 case IDC_EXSTYLE: 3015 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;3025 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3016 3026 DrawRadWindow(i,pWindowInfo); 3017 3027 return 1; … … 3026 3036 //////////////////////// 3027 3037 // LISTVIEW プロパティ 3028 BOOLCALLBACK RadProperty_ListViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){3038 INT_PTR CALLBACK RadProperty_ListViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 3029 3039 int i,i2,i3; 3030 3040 static BOOL bInitial; … … 3054 3064 3055 3065 //"アイコン" 3056 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,( long)STRING_LISTVIEWPROP_STYLE_ICON);3066 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,(LPARAM)STRING_LISTVIEWPROP_STYLE_ICON); 3057 3067 //"小さいアイコン" 3058 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,( long)STRING_LISTVIEWPROP_STYLE_SMALLICON);3068 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,(LPARAM)STRING_LISTVIEWPROP_STYLE_SMALLICON); 3059 3069 //"リスト" 3060 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,( long)STRING_LISTVIEWPROP_STYLE_LIST);3070 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,(LPARAM)STRING_LISTVIEWPROP_STYLE_LIST); 3061 3071 //"レポート" 3062 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,( long)STRING_LISTVIEWPROP_STYLE_REPORT);3072 SendDlgItemMessage(hwnd,IDC_LVS_VIEW,CB_ADDSTRING,0,(LPARAM)STRING_LISTVIEWPROP_STYLE_REPORT); 3063 3073 3064 3074 //ビットを考慮してLVS_LISTを最初に比較する … … 3074 3084 3075 3085 //"上端" 3076 SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_ADDSTRING,0,( long)STRING_TOP);3086 SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_TOP); 3077 3087 //"左端" 3078 SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_ADDSTRING,0,( long)STRING_LEFT);3088 SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_LEFT); 3079 3089 3080 3090 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_LVS_POSITION,CB_SETCURSEL,1,0); … … 3087 3097 3088 3098 //"なし" 3089 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,( long)STRING_NONE_);3099 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(LPARAM)STRING_NONE_); 3090 3100 //"昇順" 3091 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,( long)STRING_SORT_ASCENDING);3101 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(LPARAM)STRING_SORT_ASCENDING); 3092 3102 //"降順" 3093 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,( long)STRING_SORT_DESCENDING);3103 SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(LPARAM)STRING_SORT_DESCENDING); 3094 3104 3095 3105 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SORTASCENDING) SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_SETCURSEL,1,0); … … 3108 3118 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LVS_SHAREIMAGELISTS) SendDlgItemMessage(hwnd,IDC_LVS_SHAREIMAGELISTS,BM_SETCHECK,BST_CHECKED,0); 3109 3119 3110 3120 ApplyDialogTexture(hwnd); 3111 3121 bInitial=0; 3112 3122 break; … … 3286 3296 3287 3297 case IDC_EXSTYLE: 3288 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;3298 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3289 3299 DrawRadWindow(i,pWindowInfo); 3290 3300 return 1; … … 3317 3327 EnableWindow(GetDlgItem(hwnd,IDC_LBS_HASSTRINGS),1); 3318 3328 } 3319 BOOLCALLBACK RadProperty_ListBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){3329 INT_PTR CALLBACK RadProperty_ListBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 3320 3330 int i,i2,i3; 3321 3331 static BOOL bInitial; … … 3345 3355 3346 3356 //"シングル" 3347 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,( long)STRING_LISTBOXPROP_STYLE_SEL_SINGLE);3357 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(LPARAM)STRING_LISTBOXPROP_STYLE_SEL_SINGLE); 3348 3358 //"マルチ" 3349 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,( long)STRING_LISTBOXPROP_STYLE_SEL_MULTI);3359 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(LPARAM)STRING_LISTBOXPROP_STYLE_SEL_MULTI); 3350 3360 //"拡張" 3351 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,( long)STRING_LISTBOXPROP_STYLE_SEL_EXTENDED);3361 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(LPARAM)STRING_LISTBOXPROP_STYLE_SEL_EXTENDED); 3352 3362 //"なし" 3353 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,( long)STRING_NONE_);3363 SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(LPARAM)STRING_NONE_); 3354 3364 3355 3365 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_MULTIPLESEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,1,0); … … 3364 3374 3365 3375 //"なし" 3366 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,( long)STRING_NONE_);3376 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(LPARAM)STRING_NONE_); 3367 3377 //"固定" 3368 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,( long)STRING_OWNERDRAW_FIXED);3378 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(LPARAM)STRING_OWNERDRAW_FIXED); 3369 3379 //"可変" 3370 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,( long)STRING_OWNERDRAW_VARIABLE);3380 SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(LPARAM)STRING_OWNERDRAW_VARIABLE); 3371 3381 3372 3382 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&LBS_OWNERDRAWFIXED) SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_SETCURSEL,1,0); … … 3389 3399 pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->SetStyle( tempStyle ); 3390 3400 3391 3401 ApplyDialogTexture(hwnd); 3392 3402 bInitial=0; 3393 3403 break; … … 3561 3571 3562 3572 case IDC_EXSTYLE: 3563 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;3573 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3564 3574 DrawRadWindow(i,pWindowInfo); 3565 3575 return 1; … … 3574 3584 /////////////////////////// 3575 3585 // PROGRESSBAR プロパティ 3576 BOOLCALLBACK RadProperty_ProgressBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){3586 INT_PTR CALLBACK RadProperty_ProgressBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 3577 3587 int i,i2; 3578 3588 static BOOL bInitial; … … 3600 3610 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&PBS_SMOOTH) SendDlgItemMessage(hwnd,IDC_PBS_SMOOTH,BM_SETCHECK,BST_CHECKED,0); 3601 3611 3602 3612 ApplyDialogTexture(hwnd); 3603 3613 bInitial=0; 3604 3614 break; … … 3645 3655 3646 3656 case IDC_EXSTYLE: 3647 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;3657 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3648 3658 DrawRadWindow(i,pWindowInfo); 3649 3659 return 1; … … 3658 3668 // RADIOBUTTON プロパティ 3659 3669 3660 BOOLCALLBACK RadProperty_RadioButtonProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){3670 INT_PTR CALLBACK RadProperty_RadioButtonProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 3661 3671 int i,i2,i3; 3662 3672 static BOOL bInitial; … … 3696 3706 3697 3707 //"デフォルト" 3698 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_DEFAULT);3708 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_DEFAULT); 3699 3709 //"左端" 3700 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_LEFT);3710 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_LEFT); 3701 3711 //"右端" 3702 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_RIGHT);3712 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_RIGHT); 3703 3713 //"中央" 3704 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,( long)STRING_CENTER);3714 SendDlgItemMessage(hwnd,IDC_BS_HPOS,CB_ADDSTRING,0,(LPARAM)STRING_CENTER); 3705 3715 3706 3716 //ビットを考慮してBS_CENTERを最初に比較する … … 3716 3726 3717 3727 //"デフォルト" 3718 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_DEFAULT);3728 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_DEFAULT); 3719 3729 //"上端" 3720 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_TOP);3730 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_TOP); 3721 3731 //"下端" 3722 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_BOTTOM);3732 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_BOTTOM); 3723 3733 //"中央" 3724 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,( long)STRING_CENTER);3734 SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_ADDSTRING,0,(LPARAM)STRING_CENTER); 3725 3735 3726 3736 //ビットを考慮してBS_VCENTERを最初に比較する … … 3730 3740 else SendDlgItemMessage(hwnd,IDC_BS_VPOS,CB_SETCURSEL,0,0); 3731 3741 3732 3742 ApplyDialogTexture(hwnd); 3733 3743 bInitial=0; 3734 3744 break; … … 3877 3887 3878 3888 case IDC_EXSTYLE: 3879 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;3889 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3880 3890 DrawRadWindow(i,pWindowInfo); 3881 3891 return 1; … … 3891 3901 // SCROLLBAR プロパティ 3892 3902 3893 BOOLCALLBACK RadProperty_ScrollBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){3903 INT_PTR CALLBACK RadProperty_ScrollBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 3894 3904 int i,i2,i3; 3895 3905 static BOOL bInitial; … … 3920 3930 3921 3931 //"指定無し" 3922 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,( long)STRING_SCROLLBARPROP_STYLE_FREE);3932 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_SCROLLBARPROP_STYLE_FREE); 3923 3933 //"上/左" 3924 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,( long)STRING_SCROLLBARPROP_STYLE_TOPORLEFT);3934 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_SCROLLBARPROP_STYLE_TOPORLEFT); 3925 3935 //"下/右" 3926 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,( long)STRING_SCROLLBARPROP_STYLE_BOTTOMORRIGHT);3936 SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_ADDSTRING,0,(LPARAM)STRING_SCROLLBARPROP_STYLE_BOTTOMORRIGHT); 3927 3937 3928 3938 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&SBS_TOPALIGN) SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,1,0); … … 3930 3940 else SendDlgItemMessage(hwnd,IDC_SBS_POSITION,CB_SETCURSEL,0,0); 3931 3941 3932 3942 ApplyDialogTexture(hwnd); 3933 3943 bInitial=0; 3934 3944 break; … … 3961 3971 3962 3972 case IDC_EXSTYLE: 3963 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;3973 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 3964 3974 DrawRadWindow(i,pWindowInfo); 3965 3975 return 1; … … 3975 3985 // STATIC プロパティ 3976 3986 3977 BOOLCALLBACK RadProperty_StaticProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){3987 INT_PTR CALLBACK RadProperty_StaticProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 3978 3988 int i,i2,i3; 3979 3989 static BOOL bInitial; … … 4009 4019 4010 4020 //"左端" 4011 SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_ADDSTRING,0,( long)STRING_LEFT);4021 SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_ADDSTRING,0,(LPARAM)STRING_LEFT); 4012 4022 //"中央" 4013 SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_ADDSTRING,0,( long)STRING_CENTER);4023 SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_ADDSTRING,0,(LPARAM)STRING_CENTER); 4014 4024 //"右端" 4015 SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_ADDSTRING,0,( long)STRING_RIGHT);4025 SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_ADDSTRING,0,(LPARAM)STRING_RIGHT); 4016 4026 4017 4027 //ビットを考慮してSS_LEFTを最後に検討する … … 4020 4030 else SendDlgItemMessage(hwnd,IDC_SS_TEXTPOS,CB_SETCURSEL,0,0); 4021 4031 4022 4032 ApplyDialogTexture(hwnd); 4023 4033 bInitial=0; 4024 4034 break; … … 4092 4102 4093 4103 case IDC_EXSTYLE: 4094 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;4104 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4095 4105 DrawRadWindow(i,pWindowInfo); 4096 4106 return 1; … … 4105 4115 //////////////////////// 4106 4116 // TRACKBAR プロパティ 4107 BOOLCALLBACK RadProperty_TrackBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){4117 INT_PTR CALLBACK RadProperty_TrackBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 4108 4118 int i,i2,i3; 4109 4119 static BOOL bInitial; … … 4134 4144 4135 4145 //"水平方向" 4136 SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_ADDSTRING,0,( long)STRING_DIRECTION_HORIZONTAL);4146 SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_ADDSTRING,0,(LPARAM)STRING_DIRECTION_HORIZONTAL); 4137 4147 //"垂直方向" 4138 SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_ADDSTRING,0,( long)STRING_DIRECTION_VERTICAL);4148 SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_ADDSTRING,0,(LPARAM)STRING_DIRECTION_VERTICAL); 4139 4149 4140 4150 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_VERT) SendDlgItemMessage(hwnd,IDC_TBS_SITUATION,CB_SETCURSEL,1,0); … … 4147 4157 4148 4158 //"両方" 4149 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,( long)STRING_TRACKBARPROP_STYLE_POSITION_BOTH);4159 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,(LPARAM)STRING_TRACKBARPROP_STYLE_POSITION_BOTH); 4150 4160 //"上/左" 4151 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,( long)STRING_TRACKBARPROP_STYLE_POSITION_TOPORLEFT);4161 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,(LPARAM)STRING_TRACKBARPROP_STYLE_POSITION_TOPORLEFT); 4152 4162 //"下/右" 4153 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,( long)STRING_TRACKBARPROP_STYLE_POSITION_BOTTOMORRIGHT);4163 SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_ADDSTRING,0,(LPARAM)STRING_TRACKBARPROP_STYLE_POSITION_BOTTOMORRIGHT); 4154 4164 4155 4165 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_BOTH) SendDlgItemMessage(hwnd,IDC_TBS_POINT,CB_SETCURSEL,0,0); … … 4161 4171 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TBS_ENABLESELRANGE) SendDlgItemMessage(hwnd,IDC_TBS_ENABLESELRANGE,BM_SETCHECK,BST_CHECKED,0); 4162 4172 4163 4173 ApplyDialogTexture(hwnd); 4164 4174 bInitial=0; 4165 4175 break; … … 4244 4254 4245 4255 case IDC_EXSTYLE: 4246 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;4256 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4247 4257 DrawRadWindow(i,pWindowInfo); 4248 4258 return 1; … … 4257 4267 ////////////////////////// 4258 4268 // TREEVIEW プロパティ 4259 BOOLCALLBACK RadProperty_TreeViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){4269 INT_PTR CALLBACK RadProperty_TreeViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 4260 4270 int i,i2; 4261 4271 static BOOL bInitial; … … 4292 4302 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&TVS_SINGLEEXPAND) SendDlgItemMessage(hwnd,IDC_TVS_SINGLEEXPAND,BM_SETCHECK,BST_CHECKED,0); 4293 4303 4294 4304 ApplyDialogTexture(hwnd); 4295 4305 bInitial=0; 4296 4306 break; … … 4455 4465 4456 4466 case IDC_EXSTYLE: 4457 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;4467 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4458 4468 DrawRadWindow(i,pWindowInfo); 4459 4469 return 1; … … 4468 4478 ////////////////////// 4469 4479 // UPDOWN プロパティ 4470 BOOLCALLBACK RadProperty_UpDownProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){4480 INT_PTR CALLBACK RadProperty_UpDownProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 4471 4481 int i,i2,i3; 4472 4482 static BOOL bInitial; … … 4498 4508 4499 4509 //"水平方向" 4500 SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_ADDSTRING,0,( long)STRING_DIRECTION_HORIZONTAL);4510 SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_ADDSTRING,0,(LPARAM)STRING_DIRECTION_HORIZONTAL); 4501 4511 //"垂直方向" 4502 SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_ADDSTRING,0,( long)STRING_DIRECTION_VERTICAL);4512 SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_ADDSTRING,0,(LPARAM)STRING_DIRECTION_VERTICAL); 4503 4513 4504 4514 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_HORZ) SendDlgItemMessage(hwnd,IDC_UDS_SITUATION,CB_SETCURSEL,0,0); … … 4510 4520 4511 4521 //"なし" 4512 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,( long)STRING_NONE_);4522 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(LPARAM)STRING_NONE_); 4513 4523 //"左端" 4514 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,( long)STRING_LEFT);4524 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(LPARAM)STRING_LEFT); 4515 4525 //"右端" 4516 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,( long)STRING_RIGHT);4526 SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(LPARAM)STRING_RIGHT); 4517 4527 4518 4528 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ALIGNLEFT) SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_SETCURSEL,1,0); … … 4526 4536 if(pWindowInfo->childWindowInfos[MdiInfo[i]->MdiRadInfo->SelectingItem[0]]->GetStyle()&UDS_ARROWKEYS) SendDlgItemMessage(hwnd,IDC_UDS_ARROWKEYS,BM_SETCHECK,BST_CHECKED,0); 4527 4537 4528 4538 ApplyDialogTexture(hwnd); 4529 4539 bInitial=0; 4530 4540 break; … … 4630 4640 4631 4641 case IDC_EXSTYLE: 4632 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd, (DLGPROC)DlgRadProperty_Item_ExStyle)) return 1;4642 if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_ITEM_EXSTYLE),hwnd,DlgRadProperty_Item_ExStyle)) return 1; 4633 4643 DrawRadWindow(i,pWindowInfo); 4634 4644 return 1; -
trunk/ab5.0/abdev/abdev/Search.cpp
r629 r763 2 2 3 3 #include "common.h" 4 5 HRESULT ApplyDialogTexture( HWND ); 4 6 5 7 long *pFindPos; … … 74 76 LineStr[i2]=buffer[i]; 75 77 } 76 SendDlgItemMessage(hDlg,IDC_FINDLIST,LB_ADDSTRING,0,( long)LineStr);78 SendDlgItemMessage(hDlg,IDC_FINDLIST,LB_ADDSTRING,0,(LPARAM)LineStr); 77 79 i3++; 78 80 } … … 86 88 case WM_INITDIALOG: 87 89 SetPosCenter(hwnd); 90 ApplyDialogTexture(hwnd); 88 91 break; 89 92 case WM_COMMAND: … … 204 207 for(i=0;i<MAX_FINDLIST;i++){ 205 208 if(ppData[i][0]=='\0') break; 206 SendMessage(hwnd,CB_ADDSTRING,0,( long)ppData[i]);209 SendMessage(hwnd,CB_ADDSTRING,0,(LPARAM)ppData[i]); 207 210 } 208 211 SendMessage(hwnd,CB_SETCURSEL,0,0); 209 212 } 210 BOOLCALLBACK DlgFind(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){213 INT_PTR CALLBACK DlgFind(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 211 214 extern HANDLE hHeap; 212 215 HWND FindAllDlg; … … 234 237 for(i=0;i<MAX_FINDLIST;i++){ 235 238 if(pobj_nv->FindStr[i][0]=='\0') break; 236 SendDlgItemMessage(hwnd,IDC_FINDSTR,CB_ADDSTRING,0,( long)pobj_nv->FindStr[i]);239 SendDlgItemMessage(hwnd,IDC_FINDSTR,CB_ADDSTRING,0,(LPARAM)pobj_nv->FindStr[i]); 237 240 } 238 241 SendDlgItemMessage(hwnd,IDC_FINDSTR,CB_LIMITTEXT,8192,0); … … 254 257 255 258 SetFocus(GetDlgItem(hwnd,IDC_FINDSTR)); 259 260 ApplyDialogTexture(hwnd); 256 261 break; 257 262 case WM_COMMAND: … … 307 312 return 0; 308 313 } 309 BOOLCALLBACK DlgPermutation(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){314 INT_PTR CALLBACK DlgPermutation(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 310 315 extern HANDLE hHeap; 311 316 extern HINSTANCE hInst; … … 334 339 for(i=0;i<MAX_FINDLIST;i++){ 335 340 if(pobj_nv->FindStr[i][0]=='\0') break; 336 SendDlgItemMessage(hwnd,IDC_FINDSTR,CB_ADDSTRING,0,( long)pobj_nv->FindStr[i]);341 SendDlgItemMessage(hwnd,IDC_FINDSTR,CB_ADDSTRING,0,(LPARAM)pobj_nv->FindStr[i]); 337 342 } 338 343 SendDlgItemMessage(hwnd,IDC_FINDSTR,CB_LIMITTEXT,8192,0); … … 357 362 for(i=0;i<MAX_FINDLIST;i++){ 358 363 if(pobj_nv->PermutationStr[i][0]=='\0') break; 359 SendDlgItemMessage(hwnd,IDC_PERMUTATIONSTR,CB_ADDSTRING,0,( long)pobj_nv->PermutationStr[i]);364 SendDlgItemMessage(hwnd,IDC_PERMUTATIONSTR,CB_ADDSTRING,0,(LPARAM)pobj_nv->PermutationStr[i]); 360 365 } 361 366 SendDlgItemMessage(hwnd,IDC_PERMUTATIONSTR,CB_SETCURSEL,0,0); … … 363 368 364 369 SetFocus(GetDlgItem(hwnd,IDC_FINDSTR)); 370 371 ApplyDialogTexture(hwnd); 365 372 break; 366 373 case WM_COMMAND: -
trunk/ab5.0/abdev/abdev/nkf_class.cpp
r629 r763 4 4 5 5 using namespace ActiveBasic::IDE; 6 7 HRESULT ApplyDialogTexture( HWND ); 6 8 7 9 //文字コード変換用クラスライブラリ … … 155 157 156 158 157 BOOLCALLBACK nkfDlgCodeSave(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){159 INT_PTR CALLBACK nkfDlgCodeSave(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 158 160 static int WndNum; 159 161 HWND hList; … … 176 178 177 179 hList=GetDlgItem(hwnd,IDC_LIST_CHARCODE); 178 SendMessage(hList,LB_ADDSTRING,0,( long)"Shift-JIS");179 SendMessage(hList,LB_ADDSTRING,0,( long)"EUC");180 SendMessage(hList,LB_ADDSTRING,0,( long)"JIS");181 SendMessage(hList,LB_ADDSTRING,0,( long)"UTF-8");180 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)"Shift-JIS"); 181 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)"EUC"); 182 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)"JIS"); 183 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)"UTF-8"); 182 184 SendMessage(hList,LB_SETCURSEL,MdiInfo[WndNum]->pMdiTextEdit->iCharCode,0); 183 185 184 186 hList=GetDlgItem(hwnd,IDC_LIST_LFCODE); 185 SendMessage(hList,LB_ADDSTRING,0,( long)"CRLF(Windows)");186 SendMessage(hList,LB_ADDSTRING,0,( long)"LF(Unix)");187 SendMessage(hList,LB_ADDSTRING,0,( long)"CR(Macintosh)");187 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)"CRLF(Windows)"); 188 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)"LF(Unix)"); 189 SendMessage(hList,LB_ADDSTRING,0,(LPARAM)"CR(Macintosh)"); 188 190 SendMessage(hList,LB_SETCURSEL,MdiInfo[WndNum]->pMdiTextEdit->iLfCode,0); 191 ApplyDialogTexture(hwnd); 189 192 break; 190 193 case WM_COMMAND: -
trunk/ab5.0/abdev/abdev/nkf_class.h
r3 r763 43 43 44 44 //関数郡 45 BOOLCALLBACK nkfDlgCodeSave(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);45 INT_PTR CALLBACK nkfDlgCodeSave(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam); -
trunk/ab5.0/abdev/compiler_x64/stdafx.h
r703 r763 10 10 #include <streambuf> 11 11 #include <sstream> 12 #include <algorithm> 12 13 13 14 #include <windows.h> 14 15 #include <stdio.h> 16 #include <stdlib.h> 15 17 #include <string.h> 16 18 #include <math.h> … … 19 21 #include <limits.h> 20 22 #include <shlobj.h> 21 #include <process.h>22 #include <fcntl.h>23 #include <io.h>24 23 #include <shlwapi.h> 25 24 #include <tchar.h> 26 25 #include <stdarg.h> 26 #include <assert.h> 27 27 28 28 //boost libraries … … 58 58 #include <DataTableGenerator.h> 59 59 #include <BreakPoint.h> 60 61 #define lstrlenA strlen62 #define lstrcmpA strcmp63 #define lstrcpyA strcpy64 #define lstrcmpiA _stricmp -
trunk/ab5.0/abdev/compiler_x86/stdafx.h
r750 r763 14 14 #include <windows.h> 15 15 #include <stdio.h> 16 #include <stdlib.h> 16 17 #include <string.h> 17 18 #include <math.h> … … 23 24 #include <tchar.h> 24 25 #include <stdarg.h> 26 #include <assert.h> 25 27 26 28 //boost libraries -
trunk/ab5.0/jenga/include/common/String.h
r747 r763 9 9 bool IsExistString( const Jenga::Common::Strings &strings, const std::string &findStr ); 10 10 11 std::string& StringReplace( std::string& str, const std::string sb, const std::stringsa );11 std::string& StringReplace( std::string& str, const std::string &sb, const std::string &sa ); 12 12 13 13 std::string ToString( int n ); -
trunk/ab5.0/jenga/projects/jenga/stdafx.h
r521 r763 19 19 #include <io.h> 20 20 #include <imagehlp.h> 21 #include <assert.h> 21 22 22 23 //boost libraries -
trunk/ab5.0/jenga/src/common/String.cpp
r748 r763 1 1 #include "stdafx.h" 2 #include <algorithm> 2 3 3 4 bool Jenga::Common::IsExistString( const Jenga::Common::Strings &strings, const std::string &findStr ) 4 5 { 5 BOOST_FOREACH( const std::string &str, strings ) 6 { 7 if( str == findStr ) 8 { 9 return true; 10 } 11 } 12 return false; 6 return std::find( strings.begin(), strings.end(), findStr ) != strings.end(); 13 7 } 14 8 15 std::string& Jenga::Common::StringReplace( std::string& str, const std::string sb, const std::stringsa )9 std::string& Jenga::Common::StringReplace( std::string& str, const std::string &sb, const std::string &sa ) 16 10 { 17 11 std::string::size_type n, nb = 0; … … 38 32 CP_THREAD_ACP, 39 33 0, 40 wstr. c_str(), -1,34 wstr.data(), static_cast<int>(wstr.size()), 41 35 NULL, NULL, 42 36 NULL, NULL ); 43 37 44 char *pstr = (char *)calloc( needSize + 1, 1 );38 char *pstr = (char *)calloc( needSize, 1 ); 45 39 WideCharToMultiByte( 46 40 CP_THREAD_ACP, 47 41 0, 48 wstr. c_str(), -1,42 wstr.data(), static_cast<int>(wstr.size()), 49 43 pstr, needSize, 50 44 NULL, NULL ); 51 45 52 std::string result = pstr;46 std::string result(pstr, needSize); 53 47 54 48 free( pstr ); … … 62 56 CP_ACP, 63 57 0, 64 str. c_str(), static_cast<int>(str.size()) + 1,65 NULL, 0 ) * 4;58 str.data(), static_cast<int>(str.size()), 59 NULL, 0 ); 66 60 67 LPWSTR pwstr = (LPWSTR)calloc( size, 1);61 LPWSTR pwstr = (LPWSTR)calloc( size, sizeof (wchar_t) ); 68 62 69 63 MultiByteToWideChar( 70 64 CP_ACP, 71 65 0, 72 str. c_str(), static_cast<int>(str.size()) + 1,73 pwstr, s tatic_cast<int>(str.size()) + 1);66 str.data(), static_cast<int>(str.size()), 67 pwstr, size ); 74 68 75 std::wstring wstr( pwstr, s tr.size());69 std::wstring wstr( pwstr, size ); 76 70 77 71 free( pwstr );
Note:
See TracChangeset
for help on using the changeset viewer.