Changeset 84 in dev
- Timestamp:
- Mar 29, 2007, 3:28:28 AM (18 years ago)
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
BasicCompiler64/BasicCompiler.vcproj
r79 r84 383 383 LinkIncremental="2" 384 384 SuppressStartupBanner="true" 385 IgnoreDefaultLibraryNames=" "385 IgnoreDefaultLibraryNames="libcpmtd" 386 386 GenerateDebugInformation="false" 387 387 ProgramDatabaseFile=".\Release/BasicCompiler64.pdb" -
BasicCompiler_Common/ParamImpl.cpp
r78 r84 151 151 } 152 152 else{ 153 if(NATURAL_TYPE(argType.GetBasicType())==DEF_OBJECT || NATURAL_TYPE(argType.GetBasicType())==DEF_STRUCT){ 153 //if(NATURAL_TYPE(argType.GetBasicType())==DEF_OBJECT || NATURAL_TYPE(argType.GetBasicType())==DEF_STRUCT){ 154 if( NATURAL_TYPE(argType.GetBasicType())==DEF_STRUCT){ 154 155 if(argType.GetIndex()!=param.GetIndex()){ 156 return false; 157 } 158 } 159 else if( NATURAL_TYPE(argType.GetBasicType())==DEF_OBJECT ){ 160 if( !param.GetClass().IsEqualsOrSubClass( &argType.GetClass() ) ){ 155 161 return false; 156 162 } -
BasicCompiler_Common/common.h
r79 r84 47 47 48 48 #ifdef _AMD64_ 49 #define VER_INFO " β17 (x64)"49 #define VER_INFO "(x64) β rev.184" 50 50 #else 51 #define VER_INFO "β 17"51 #define VER_INFO "β rev.184" 52 52 #endif 53 53 -
ProjectEditor/Common.h
r80 r84 66 66 #define APPLICATION_NAME "ActiveBasic 5.0" 67 67 #define VERSION_APPLI_NAME APPLICATION_NAME 68 #define VERSION_STRING "5.00.00 β 17"68 #define VERSION_STRING "5.00.00 β rev.193" 69 69 70 70 #endif … … 1087 1087 void ResizeProjectView_ToolWindow(void); 1088 1088 LRESULT CALLBACK ProjectView_ToolWindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam); 1089 void ShowFileView(); 1090 void ShowClassView(); 1091 void ShowMaterialView(); 1089 1092 LRESULT CALLBACK ProjectViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam); 1090 1093 void Project_File_Insert(char *path); -
ProjectEditor/ProjectControl.cpp
r81 r84 398 398 return DefWindowProc(hwnd,message,wParam,lParam); 399 399 } 400 void ShowFileView(){ 401 TabCtrl_SetCurSel(hProjectViewTab,0); 402 ShowWindow(pobj_FileTree->hTree,SW_SHOW); 403 ShowWindow(hProcedureTreeView,SW_HIDE); 404 ShowWindow(hMaterialTreeView,SW_HIDE); 405 } 406 void ShowClassView(){ 407 TabCtrl_SetCurSel(hProjectViewTab,1); 408 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 409 ShowWindow(hMaterialTreeView,SW_HIDE); 410 ShowWindow(hProcedureTreeView,SW_SHOW); 411 } 412 void ShowMaterialView(){ 413 TabCtrl_SetCurSel(hProjectViewTab,2); 414 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 415 ShowWindow(hProcedureTreeView,SW_HIDE); 416 ShowWindow(hMaterialTreeView,SW_SHOW); 417 } 400 418 LRESULT CALLBACK ProjectViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){ 401 419 extern HINSTANCE hInst,hResInst; … … 404 422 extern HFONT hStatusFont; 405 423 extern HWND hProjectView_ToolWindow; 406 int i;407 424 RECT rect; 408 425 HWND hButton; … … 510 527 hdr=(NMHDR *)lParam; 511 528 if(hdr->hwndFrom==hProjectViewTab&&hdr->code==TCN_SELCHANGE){ 512 i=TabCtrl_GetCurSel(hProjectViewTab); 513 if(i==0){ 514 ShowWindow(pobj_FileTree->hTree,SW_SHOW); 515 ShowWindow(hProcedureTreeView,SW_HIDE); 516 ShowWindow(hMaterialTreeView,SW_HIDE); 517 } 518 else if(i==1){ 519 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 520 ShowWindow(hMaterialTreeView,SW_HIDE); 521 ShowWindow(hProcedureTreeView,SW_SHOW); 522 } 523 else if(i==2){ 524 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 525 ShowWindow(hProcedureTreeView,SW_HIDE); 526 ShowWindow(hMaterialTreeView,SW_SHOW); 529 switch( TabCtrl_GetCurSel(hProjectViewTab) ){ 530 case 0: 531 ShowFileView(); 532 break; 533 case 1: 534 ShowClassView(); 535 break; 536 case 2: 537 ShowMaterialView(); 538 break; 527 539 } 528 540 } … … 1601 1613 } 1602 1614 sscanf(temporary,"%d",&i2); 1603 TabCtrl_SetCurSel(hProjectViewTab,i2); 1604 if(i2==0){ 1605 ShowWindow(pobj_FileTree->hTree,SW_SHOW); 1606 ShowWindow(hProcedureTreeView,SW_HIDE); 1607 ShowWindow(hMaterialTreeView,SW_HIDE); 1608 } 1609 else if(i2==1){ 1610 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 1611 ShowWindow(hMaterialTreeView,SW_HIDE); 1612 ShowWindow(hProcedureTreeView,SW_SHOW); 1613 } 1614 else if(i2==2){ 1615 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 1616 ShowWindow(hProcedureTreeView,SW_HIDE); 1617 ShowWindow(hMaterialTreeView,SW_SHOW); 1618 } 1615 1616 switch( i2 ){ 1617 case 0: 1618 ShowFileView(); 1619 break; 1620 case 1: 1621 ShowClassView(); 1622 break; 1623 case 2: 1624 ShowMaterialView(); 1625 break; 1626 } 1627 1619 1628 if(buffer[i]=='\0') goto EndToSetWorkFile; 1620 1629 … … 1726 1735 } 1727 1736 sscanf(temporary,"%d",&i2); 1728 TabCtrl_SetCurSel(hProjectViewTab,i2); 1729 if(i2==0){ 1730 ShowWindow(hProcedureTreeView,SW_HIDE); 1731 ShowWindow(hMaterialTreeView,SW_HIDE); 1732 ShowWindow(pobj_FileTree->hTree,SW_SHOW); 1733 } 1734 else if(i2==1){ 1735 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 1736 ShowWindow(hMaterialTreeView,SW_HIDE); 1737 ShowWindow(hProcedureTreeView,SW_SHOW); 1738 } 1739 else if(i2==2){ 1740 ShowWindow(pobj_FileTree->hTree,SW_HIDE); 1741 ShowWindow(hProcedureTreeView,SW_HIDE); 1742 ShowWindow(hMaterialTreeView,SW_SHOW); 1743 } 1737 1738 switch( i2 ){ 1739 case 0: 1740 ShowFileView(); 1741 break; 1742 case 1: 1743 ShowClassView(); 1744 break; 1745 case 2: 1746 ShowMaterialView(); 1747 break; 1748 } 1749 1744 1750 if(buffer[i]=='\0') goto EndToSetWorkFile; 1745 1751 -
ProjectEditor/ProjectEditor.cpp
r81 r84 953 953 ResetState_DocMenu(); 954 954 955 if( DocumentType == WNDTYPE_BASIC && ProjectInfo.name[0] == '\0' ){ 956 // 単体ソースコードを開いたとき 957 if( !IsWindowVisible( hProjectView ) ){ 958 // クラスビューを表示する 959 SendMessage(hOwner,WM_COMMAND,IDM_PROJECTVIEW,0); 960 ShowClassView(); 961 962 // クラスビューを更新 963 ResetClassTree(-1); 964 } 965 } 966 955 967 return hChild; 956 968 } … … 1187 1199 //タブコントロール 1188 1200 pobj_MainTab->MdiActiveEvent(MdiInfo[i].title); 1201 1202 if( !ProjectInfo.name[0] ){ 1203 ResetClassTree(-1); 1204 } 1189 1205 1190 1206 return 0; -
ProjectEditor/SubOperation.cpp
r83 r84 645 645 } 646 646 647 DeleteDC(hdc);647 ReleaseDC(GetDesktopWindow(),hdc); 648 648 649 649 return hBitmap; … … 691 691 } 692 692 693 DeleteDC(hdc);693 ReleaseDC(GetDesktopWindow(),hdc); 694 694 695 695 return hBitmap; … … 733 733 } 734 734 735 DeleteDC(hdc);735 ReleaseDC(GetDesktopWindow(),hdc); 736 736 737 737 return hBitmap; … … 808 808 HeapDefaultFree(pByte); 809 809 810 DeleteDC(hdc);810 ReleaseDC(GetDesktopWindow(),hdc); 811 811 812 812 … … 1236 1236 1237 1237 extern char *pHeaderBuf; 1238 sprintf(temporary,"%sInclude\\basic.sbp",pj_editor_Dir); 1238 sprintf(temporary,"%sbasic.sbp",pobj_nv->szIncludeDir); 1239 GetFullPath( temporary, pj_editor_Dir ); 1239 1240 pHeaderBuf=ReadBuffer(temporary); 1241 1242 if( !pHeaderBuf ){ 1243 pHeaderBuf=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1); 1244 } 1240 1245 1241 1246 //ファイルをインクルード -
ProjectEditor/menu.cpp
r3 r84 210 210 if(ppobj_MenuItemData[item_index]->str){ 211 211 HDC hdc; 212 hdc = GetDC( hOwner);212 hdc = GetDC(GetDesktopWindow()); 213 213 HFONT hOldFont; 214 214 hOldFont = (HFONT)SelectObject(hdc, hMenuFont); … … 220 220 221 221 SelectObject(hdc,hOldFont); 222 DeleteDC(hdc);222 ReleaseDC(GetDesktopWindow(),hdc); 223 223 } 224 224 else{ … … 347 347 if(ppobj_MenuItemData[item_index]->str){ 348 348 HDC hdc; 349 hdc = GetDC( hOwner);349 hdc = GetDC(GetDesktopWindow()); 350 350 HFONT hOldFont; 351 351 hOldFont = (HFONT)SelectObject(hdc, hMenuFont); … … 357 357 358 358 SelectObject(hdc,hOldFont); 359 DeleteDC(hdc);359 ReleaseDC(GetDesktopWindow(),hdc); 360 360 361 361 pSize->cx+=50;
Note:
See TracChangeset
for help on using the changeset viewer.