Changeset 824 in dev for trunk/ab5.0/abdev


Ignore:
Timestamp:
Feb 19, 2012, 8:58:50 PM (13 years ago)
Author:
イグトランス (egtra)
Message:

Windows SDK 7.1以上を前提とし、それ以前のWindows/Platform SDK対応の記述を削除。

Location:
trunk/ab5.0/abdev
Files:
4 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ab5.0/abdev/BasicCompiler_Common/common.h

    r764 r824  
    1717
    1818#include "../BasicCompiler_Common/NonVolatile.h"
    19 #include "../BasicCompiler_Common/psapi.h"
     19#include <psapi.h>
    2020
    2121
  • trunk/ab5.0/abdev/abdev/include/MainFrame.h

    r772 r824  
    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
    3229    boost::shared_ptr<TaskbarList> taskbarList;
    33 #endif
    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    // 「新規作成」メニューがクリックされた
     
    302296        MSG_WM_PAINT( OnPaint )
    303297        MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine )   
    304 #ifdef HAVE_WINDOWS_7_SDK
    305298        MESSAGE_HANDLER_EX( TaskbarButtonCreated, OnTaskbarButtonCreated )
    306 #endif
    307299        COMMAND_ID_HANDLER_EX( IDM_NEW, OnCmdNew )
    308300        COMMAND_ID_HANDLER_EX( IDM_OPEN, OnCmdOpen )
  • trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

    r772 r824  
    2727    CloseHandle( pi.hThread );
    2828}
    29 
    30 #ifdef HAVE_WINDOWS_7_SDK
    3129
    3230#define MSGFLT_ADD 1
     
    311309    WindowMap windowMap;
    312310};
    313 #endif HAVE_WINDOWS_7_SDK
    314 
    315 #ifdef HAVE_WINDOWS_7_SDK
     311
    316312MainFrame::MainFrame() :
    317313    TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) )
     
    330326    }
    331327}
    332 #else
    333 MainFrame::MainFrame() {}
    334 #endif
    335328
    336329void MainFrame::Resized()
     
    925918::LRESULT MainFrame::OnTaskbarButtonCreated( ::UINT msg, ::WPARAM, ::LPARAM )
    926919{
    927 #ifdef HAVE_WINDOWS_7_SDK
    928920    if ( msg == 0 ) { // 念のため確認
    929921        return 0;
    930922    }
    931923    taskbarList.reset(new TaskbarList(*this));
    932 #endif
    933924    return 0;
    934925}
     
    936927void MainFrame::AddChildWindow( HWND hwndChild )
    937928{
    938 #ifdef HAVE_WINDOWS_7_SDK
    939     taskbarList->RegisterTab( hwndChild );
    940 #endif
     929    if (taskbarList)
     930    {
     931        taskbarList->RegisterTab( hwndChild );
     932    }
    941933}
    942934
    943935void MainFrame::DeleteChildWindow( HWND hwndChild )
    944936{
    945 #ifdef HAVE_WINDOWS_7_SDK
    946     taskbarList->UnregisterTab( hwndChild );
    947 #endif
     937    if (taskbarList)
     938    {
     939        taskbarList->UnregisterTab( hwndChild );
     940    }
    948941}
    949942
    950943void MainFrame::ActivateChildWindow( HWND hwndChild )
    951944{
    952 #ifdef HAVE_WINDOWS_7_SDK
    953     taskbarList->SetTabActivate( hwndChild );
    954 #endif
     945    if (taskbarList)
     946    {
     947        taskbarList->SetTabActivate( hwndChild );
     948    }
    955949}
    956950
    957951void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore )
    958952{
    959 #ifdef HAVE_WINDOWS_7_SDK
    960     taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
    961 #endif
     953    if (taskbarList)
     954    {
     955        taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
     956    }
    962957}
    963958
    964959void MainFrame::InvalidateBitmap( HWND hwndChild )
    965960{
    966 #ifdef HAVE_WINDOWS_7_SDK
    967     taskbarList->InvalidateIconicBitmaps( hwndChild );
    968 #endif
     961    if (taskbarList)
     962    {
     963        taskbarList->InvalidateIconicBitmaps( hwndChild );
     964    }
    969965}
    970966
Note: See TracChangeset for help on using the changeset viewer.