Changeset 778 in dev for branches/egtra/ab5.0/abdev
- Timestamp:
- Jan 24, 2011, 2:01:54 AM (14 years ago)
- Location:
- branches/egtra/ab5.0/abdev
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj
r777 r778 49 49 </PropertyGroup> 50 50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 51 <ImportGroup Label="ExtensionSettings"> 52 </ImportGroup> 51 <ImportGroup Label="ExtensionSettings" /> 53 52 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 54 53 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 222 221 </ItemGroup> 223 222 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 224 <ImportGroup Label="ExtensionTargets"> 225 </ImportGroup> 223 <ImportGroup Label="ExtensionTargets" /> 226 224 </Project> -
branches/egtra/ab5.0/abdev/abdev/DrawBuffer.cpp
r772 r778 273 273 }; 274 274 275 static bool IsRemoteSession() 276 { 277 OSVERSIONINFO vi = {sizeof vi}; 278 BOOL ret = ::GetVersionEx(&vi); 279 if (ret && vi.dwMajorVersion >= 5) 280 { 281 const int SM_REMOTESESSION = 0x1000; 282 return GetSystemMetrics(SM_REMOTESESSION); 283 } 284 return false; 285 } 286 275 287 void TextEdit_DrawBuffer(HDC hdc,int WndNum,bool drawDirectly){ 276 288 int i,i2; … … 307 319 OnePage_CharHeight, 308 320 iLineNumberTextCount, 309 drawDirectly || GetSystemMetrics(SM_REMOTESESSION));321 drawDirectly || IsRemoteSession()); 310 322 311 323 -
branches/egtra/ab5.0/abdev/abdev/TextEditor_EventProc.cpp
r772 r778 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; -
branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj
r777 r778 50 50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 51 51 <ImportGroup Label="ExtensionSettings"> 52 <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" /> 52 53 </ImportGroup> 53 54 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> … … 101 102 <Optimization>Disabled</Optimization> 102 103 <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 103 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x0 501;_WIN32_WINNT=0x0501;TIXML_USE_STL;HAVE_WINDOWS_7_SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>104 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions> 104 105 <MinimalRebuild>false</MinimalRebuild> 105 106 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> … … 115 116 </ResourceCompile> 116 117 <Link> 117 <AdditionalDependencies> odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>118 <AdditionalDependencies>unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 118 119 <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 119 <DelayLoadDLLs> DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>120 <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> 120 121 <GenerateDebugInformation>true</GenerateDebugInformation> 121 122 <SubSystem>Windows</SubSystem> … … 158 159 </ResourceCompile> 159 160 <Link> 160 <AdditionalDependencies> odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>161 <AdditionalDependencies>comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxmld_STL.lib;%(AdditionalDependencies)</AdditionalDependencies> 161 162 <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 162 163 <GenerateDebugInformation>true</GenerateDebugInformation> … … 186 187 <Optimization>MinSpace</Optimization> 187 188 <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 188 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x0 501;_WIN32_WINNT=0x0501;TIXML_USE_STL;HAVE_WINDOWS_7_SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>189 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions> 189 190 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 190 191 <PrecompiledHeader>Use</PrecompiledHeader> … … 198 199 </ResourceCompile> 199 200 <Link> 200 <AdditionalDependencies> odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>201 <AdditionalDependencies>unicows.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies> 201 202 <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 202 203 <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> … … 242 243 </ResourceCompile> 243 244 <Link> 244 <AdditionalDependencies> odbc32.lib;odbccp32.lib;comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;%(AdditionalDependencies)</AdditionalDependencies>245 <AdditionalDependencies>comctl32.lib;imm32.lib;htmlhelp.lib;rpcrt4.lib;imagehlp.lib;tinyxml_STL.lib;%(AdditionalDependencies)</AdditionalDependencies> 245 246 <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 246 247 <DelayLoadDLLs>PSAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs> … … 273 274 </ItemGroup> 274 275 <ItemGroup> 276 <ClCompile Include="..\OldWindowsHelperImpl.cpp"> 277 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 278 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 279 </ClCompile> 275 280 <ClCompile Include="src\WindowComponents\PartialManager\TextEditPartialManager.cpp" /> 276 281 <ClCompile Include="src\WindowComponents\CodeEditor\Syntax.cpp" /> … … 682 687 <None Include="main.ico" /> 683 688 </ItemGroup> 689 <ItemGroup> 690 <MASM Include="..\OldWindowsHelper.asm"> 691 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 692 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 693 </MASM> 694 </ItemGroup> 684 695 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 685 696 <ImportGroup Label="ExtensionTargets"> 697 <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" /> 686 698 </ImportGroup> 687 699 </Project> -
branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj.filters
r777 r778 336 336 <Filter>Source Files\ProjectManager</Filter> 337 337 </ClCompile> 338 <ClCompile Include="..\OldWindowsHelperImpl.cpp"> 339 <Filter>Source Files</Filter> 340 </ClCompile> 338 341 </ItemGroup> 339 342 <ItemGroup> … … 506 509 <None Include="main.ico" /> 507 510 </ItemGroup> 511 <ItemGroup> 512 <MASM Include="..\OldWindowsHelper.asm"> 513 <Filter>Source Files</Filter> 514 </MASM> 515 </ItemGroup> 508 516 </Project> -
branches/egtra/ab5.0/abdev/abdev/include/MainFrame.h
r772 r778 17 17 #define WM_DESTROYDEBUGGERVIEW WM_USER+76 //デバッガウィンドウが表示されたとき 18 18 19 #ifdef HAVE_WINDOWS_7_SDK20 19 class TaskbarList; 21 #endif22 20 23 21 namespace ActiveBasic{ namespace IDE{ … … 29 27 WindowAreaManager wam; 30 28 UINT TaskbarButtonCreated; 31 #ifdef HAVE_WINDOWS_7_SDK 32 boost::shared_ptr<TaskbarList> taskbarList; 33 #endif 29 std::shared_ptr<TaskbarList> taskbarList; 34 30 35 31 public: … … 90 86 ::LRESULT OnShowSourceLine( ::UINT msg, ::WPARAM wParam, ::LPARAM lParam, ::BOOL& handled ); 91 87 92 #ifdef HAVE_WINDOWS_7_SDK93 88 // タスクバーボタンが生成された 94 89 ::LRESULT OnTaskbarButtonCreated(::UINT msg, ::WPARAM wParam, ::LPARAM lParam); … … 108 103 // サムネイル画像が古くなった(ので更新したい) 109 104 void InvalidateBitmap( HWND hwndChild ); 110 #endif111 105 112 106 // 「新規作成」メニューがクリックされた … … 301 295 MSG_WM_DROPFILES( OnDropFiles ) 302 296 MSG_WM_PAINT( OnPaint ) 303 MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine ) 304 #ifdef HAVE_WINDOWS_7_SDK 297 MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine ) 305 298 MESSAGE_HANDLER_EX( TaskbarButtonCreated, OnTaskbarButtonCreated ) 306 #endif307 299 COMMAND_ID_HANDLER_EX( IDM_NEW, OnCmdNew ) 308 300 COMMAND_ID_HANDLER_EX( IDM_OPEN, OnCmdOpen ) -
branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp
r772 r778 28 28 } 29 29 30 #ifdef HAVE_WINDOWS_7_SDK31 32 30 #define MSGFLT_ADD 1 33 31 … … 57 55 wndTarget(hwndTarget) 58 56 { 57 DWORD const WS_EX_NOACTIVATE = 0x08000000; 58 59 59 HWND hwndDummy = Create( hOwner, CRect( -32000, -32000, 1, 1 ), title, 60 60 WS_BORDER | WS_SYSMENU | WS_CAPTION, WS_EX_NOACTIVATE); … … 311 311 WindowMap windowMap; 312 312 }; 313 #endif HAVE_WINDOWS_7_SDK 314 315 #ifdef HAVE_WINDOWS_7_SDK 313 316 314 MainFrame::MainFrame() : 317 315 TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) ) … … 330 328 } 331 329 } 332 #else333 MainFrame::MainFrame() {}334 #endif335 330 336 331 void MainFrame::Resized() … … 925 920 ::LRESULT MainFrame::OnTaskbarButtonCreated( ::UINT msg, ::WPARAM, ::LPARAM ) 926 921 { 927 #ifdef HAVE_WINDOWS_7_SDK928 922 if ( msg == 0 ) { // 念のため確認 929 923 return 0; 930 924 } 931 925 taskbarList.reset(new TaskbarList(*this)); 932 #endif933 926 return 0; 934 927 } … … 936 929 void MainFrame::AddChildWindow( HWND hwndChild ) 937 930 { 938 #ifdef HAVE_WINDOWS_7_SDK939 931 taskbarList->RegisterTab( hwndChild ); 940 #endif941 932 } 942 933 943 934 void MainFrame::DeleteChildWindow( HWND hwndChild ) 944 935 { 945 #ifdef HAVE_WINDOWS_7_SDK946 936 taskbarList->UnregisterTab( hwndChild ); 947 #endif948 937 } 949 938 950 939 void MainFrame::ActivateChildWindow( HWND hwndChild ) 951 940 { 952 #ifdef HAVE_WINDOWS_7_SDK953 941 taskbarList->SetTabActivate( hwndChild ); 954 #endif955 942 } 956 943 957 944 void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore ) 958 945 { 959 #ifdef HAVE_WINDOWS_7_SDK960 946 taskbarList->SetTabOrder( hwndChild, hwndInsertBefore ); 961 #endif962 947 } 963 948 964 949 void MainFrame::InvalidateBitmap( HWND hwndChild ) 965 950 { 966 #ifdef HAVE_WINDOWS_7_SDK967 951 taskbarList->InvalidateIconicBitmaps( hwndChild ); 968 #endif969 952 } 970 953
Note:
See TracChangeset
for help on using the changeset viewer.