Changeset 778 in dev for branches/egtra/ab5.0/abdev


Ignore:
Timestamp:
Jan 24, 2011, 2:01:54 AM (14 years ago)
Author:
イグトランス (egtra)
Message:

XP以前対応途中(Win98でabdevが起動するところまで)

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  
    4949  </PropertyGroup>
    5050  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    51   <ImportGroup Label="ExtensionSettings">
    52   </ImportGroup>
     51  <ImportGroup Label="ExtensionSettings" />
    5352  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    5453    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     
    222221  </ItemGroup>
    223222  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    224   <ImportGroup Label="ExtensionTargets">
    225   </ImportGroup>
     223  <ImportGroup Label="ExtensionTargets" />
    226224</Project>
  • branches/egtra/ab5.0/abdev/abdev/DrawBuffer.cpp

    r772 r778  
    273273};
    274274
     275static 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
    275287void TextEdit_DrawBuffer(HDC hdc,int WndNum,bool drawDirectly){
    276288    int i,i2;
     
    307319        OnePage_CharHeight,
    308320        iLineNumberTextCount,
    309         drawDirectly || GetSystemMetrics(SM_REMOTESESSION));
     321        drawDirectly || IsRemoteSession());
    310322
    311323
  • branches/egtra/ab5.0/abdev/abdev/TextEditor_EventProc.cpp

    r772 r778  
    2929int hide_caret_switch;
    3030
     31const UINT WM_IME_REQUEST = 0x0288;
    3132LRESULT CALLBACK TextEditProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
    3233    extern HANDLE hHeap;
  • branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj

    r777 r778  
    5050  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    5151  <ImportGroup Label="ExtensionSettings">
     52    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
    5253  </ImportGroup>
    5354  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     
    101102      <Optimization>Disabled</Optimization>
    102103      <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    103       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x0501;_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>
    104105      <MinimalRebuild>false</MinimalRebuild>
    105106      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     
    115116    </ResourceCompile>
    116117    <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>
    118119      <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    119       <DelayLoadDLLs>DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
     120      <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
    120121      <GenerateDebugInformation>true</GenerateDebugInformation>
    121122      <SubSystem>Windows</SubSystem>
     
    158159    </ResourceCompile>
    159160    <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>
    161162      <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    162163      <GenerateDebugInformation>true</GenerateDebugInformation>
     
    186187      <Optimization>MinSpace</Optimization>
    187188      <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    188       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x0501;_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>
    189190      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    190191      <PrecompiledHeader>Use</PrecompiledHeader>
     
    198199    </ResourceCompile>
    199200    <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>
    201202      <AdditionalLibraryDirectories>..\..\jenga\lib\x86;..\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    202203      <DelayLoadDLLs>PSAPI.DLL;DWMAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
     
    242243    </ResourceCompile>
    243244    <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>
    245246      <AdditionalLibraryDirectories>..\..\jenga\lib\x64;..\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    246247      <DelayLoadDLLs>PSAPI.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
     
    273274  </ItemGroup>
    274275  <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>
    275280    <ClCompile Include="src\WindowComponents\PartialManager\TextEditPartialManager.cpp" />
    276281    <ClCompile Include="src\WindowComponents\CodeEditor\Syntax.cpp" />
     
    682687    <None Include="main.ico" />
    683688  </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>
    684695  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    685696  <ImportGroup Label="ExtensionTargets">
     697    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
    686698  </ImportGroup>
    687699</Project>
  • branches/egtra/ab5.0/abdev/abdev/abdev.vcxproj.filters

    r777 r778  
    336336      <Filter>Source Files\ProjectManager</Filter>
    337337    </ClCompile>
     338    <ClCompile Include="..\OldWindowsHelperImpl.cpp">
     339      <Filter>Source Files</Filter>
     340    </ClCompile>
    338341  </ItemGroup>
    339342  <ItemGroup>
     
    506509    <None Include="main.ico" />
    507510  </ItemGroup>
     511  <ItemGroup>
     512    <MASM Include="..\OldWindowsHelper.asm">
     513      <Filter>Source Files</Filter>
     514    </MASM>
     515  </ItemGroup>
    508516</Project>
  • branches/egtra/ab5.0/abdev/abdev/include/MainFrame.h

    r772 r778  
    1717#define WM_DESTROYDEBUGGERVIEW  WM_USER+76  //デバッガウィンドウが表示されたとき
    1818
    19 #ifdef HAVE_WINDOWS_7_SDK
    2019class TaskbarList;
    21 #endif
    2220
    2321namespace ActiveBasic{ namespace IDE{
     
    2927    WindowAreaManager wam;
    3028    UINT TaskbarButtonCreated;
    31 #ifdef HAVE_WINDOWS_7_SDK
    32     boost::shared_ptr<TaskbarList> taskbarList;
    33 #endif
     29    std::shared_ptr<TaskbarList> taskbarList;
    3430
    3531public:
     
    9086    ::LRESULT OnShowSourceLine( ::UINT msg, ::WPARAM wParam, ::LPARAM lParam, ::BOOL& handled );
    9187
    92 #ifdef HAVE_WINDOWS_7_SDK
    9388    // タスクバーボタンが生成された
    9489    ::LRESULT OnTaskbarButtonCreated(::UINT msg, ::WPARAM wParam, ::LPARAM lParam);
     
    108103    // サムネイル画像が古くなった(ので更新したい)
    109104    void InvalidateBitmap( HWND hwndChild );
    110 #endif
    111105
    112106    // 「新規作成」メニューがクリックされた
     
    301295        MSG_WM_DROPFILES( OnDropFiles )
    302296        MSG_WM_PAINT( OnPaint )
    303         MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine )   
    304 #ifdef HAVE_WINDOWS_7_SDK
     297        MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine )
    305298        MESSAGE_HANDLER_EX( TaskbarButtonCreated, OnTaskbarButtonCreated )
    306 #endif
    307299        COMMAND_ID_HANDLER_EX( IDM_NEW, OnCmdNew )
    308300        COMMAND_ID_HANDLER_EX( IDM_OPEN, OnCmdOpen )
  • branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp

    r772 r778  
    2828}
    2929
    30 #ifdef HAVE_WINDOWS_7_SDK
    31 
    3230#define MSGFLT_ADD 1
    3331
     
    5755        wndTarget(hwndTarget)
    5856    {
     57        DWORD const WS_EX_NOACTIVATE = 0x08000000;
     58
    5959        HWND hwndDummy = Create( hOwner, CRect( -32000, -32000, 1, 1 ), title,
    6060            WS_BORDER | WS_SYSMENU | WS_CAPTION, WS_EX_NOACTIVATE);
     
    311311    WindowMap windowMap;
    312312};
    313 #endif HAVE_WINDOWS_7_SDK
    314 
    315 #ifdef HAVE_WINDOWS_7_SDK
     313
    316314MainFrame::MainFrame() :
    317315    TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) )
     
    330328    }
    331329}
    332 #else
    333 MainFrame::MainFrame() {}
    334 #endif
    335330
    336331void MainFrame::Resized()
     
    925920::LRESULT MainFrame::OnTaskbarButtonCreated( ::UINT msg, ::WPARAM, ::LPARAM )
    926921{
    927 #ifdef HAVE_WINDOWS_7_SDK
    928922    if ( msg == 0 ) { // 念のため確認
    929923        return 0;
    930924    }
    931925    taskbarList.reset(new TaskbarList(*this));
    932 #endif
    933926    return 0;
    934927}
     
    936929void MainFrame::AddChildWindow( HWND hwndChild )
    937930{
    938 #ifdef HAVE_WINDOWS_7_SDK
    939931    taskbarList->RegisterTab( hwndChild );
    940 #endif
    941932}
    942933
    943934void MainFrame::DeleteChildWindow( HWND hwndChild )
    944935{
    945 #ifdef HAVE_WINDOWS_7_SDK
    946936    taskbarList->UnregisterTab( hwndChild );
    947 #endif
    948937}
    949938
    950939void MainFrame::ActivateChildWindow( HWND hwndChild )
    951940{
    952 #ifdef HAVE_WINDOWS_7_SDK
    953941    taskbarList->SetTabActivate( hwndChild );
    954 #endif
    955942}
    956943
    957944void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore )
    958945{
    959 #ifdef HAVE_WINDOWS_7_SDK
    960946    taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
    961 #endif
    962947}
    963948
    964949void MainFrame::InvalidateBitmap( HWND hwndChild )
    965950{
    966 #ifdef HAVE_WINDOWS_7_SDK
    967951    taskbarList->InvalidateIconicBitmaps( hwndChild );
    968 #endif
    969952}
    970953
Note: See TracChangeset for help on using the changeset viewer.