Changeset 793 in dev


Ignore:
Timestamp:
Jan 30, 2011, 6:29:32 PM (13 years ago)
Author:
イグトランス (egtra)
Message:

代替のリソース読み込み関数の名称を変更（WinAPIとかぶらないものへ）

Location:
branches/egtra/ab5.0/abdev
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/egtra/ab5.0/abdev/ab-test/ab-test.cpp

    r789 r793  
    117117
    118118    auto hBasicProgramIconL = (HICON)::LoadImage(hmodRes.get(), MAKEINTRESOURCE(IDI_BASICPROGRAM), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
    119     auto hBasicProgramIconR = abres::LoadIcon(hmodRes.get(), IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
     119    auto hBasicProgramIconR = abres::LoadIconAlt(hmodRes.get(), IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
    120120
    121121    BOOST_CHECK(hBasicProgramIconL != nullptr);
    … …  
    125125
    126126    auto hcurL = ::LoadCursor(hmodRes.get(), MAKEINTRESOURCE(IDC_CURSOR_PEN));
    127     auto hcurR = abres::LoadCursor(hmodRes.get(), IDC_CURSOR_PEN);
     127    auto hcurR = abres::LoadCursorAlt(hmodRes.get(), IDC_CURSOR_PEN);
    128128
    129129    BOOST_CHECK(hcurL != nullptr);
    … …  
    140140    ::LoadStringW(hmodRes.get(), IDS_DEV_GROUP, strL, ARRAYSIZE(strL));
    141141
    142     boost::optional<std::wstring> strR = abres::LoadString(hmodRes.get(), IDS_DEV_GROUP);
     142    boost::optional<std::wstring> strR = abres::LoadStringAlt(hmodRes.get(), IDS_DEV_GROUP);
    143143
    144144    BOOST_CHECK(!!strR);

  • branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp

    r792 r793  
    7070}
    7171
    72 }
     72} // unnamed namespace
    7373
    74 HICON LoadIcon(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load)
     74HICON LoadIconAlt(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load)
    7575{
    7676    return LoadIconCursorImpl(hinst, id, cxDesired, cyDesired, load, true);
    7777}
    7878
    79 HICON LoadIcon(HINSTANCE hinst, USHORT id)
     79HICON LoadIconAlt(HINSTANCE hinst, USHORT id)
    8080{
    8181    return LoadIconCursorImpl(hinst, id, 32, 32, LR_SHARED, true);
    8282}
    8383
    84 HCURSOR LoadCursor(HINSTANCE hinst, USHORT id)
     84HCURSOR LoadCursorAlt(HINSTANCE hinst, USHORT id)
    8585{
    8686    return LoadIconCursorImpl(hinst, id, 32, 32, LR_SHARED, false);
    … …  
    9090// How To Use LoadResource to Load Strings from a String Table
    9191// http://support.microsoft.com/kb/200893/en-us
    92 boost::optional<std::wstring> LoadString(HINSTANCE hinst, USHORT id)
     92boost::optional<std::wstring> LoadStringAlt(HINSTANCE hinst, USHORT id)
    9393{
    9494    UINT idRsrcBlk = id / 16 + 1;
    … …  
    123123}
    124124
     125namespace {
     126
    125127// http://msdn.microsoft.com/en-us/library/ms648010.aspx
    126128struct ACCELTABLEENTRY
    … …  
    138140}
    139141
    140 HACCEL LoadAccelerators(HINSTANCE hinst, USHORT id)
     142} // unnamed namespace
     143
     144HACCEL LoadAcceleratorsAlt(HINSTANCE hinst, USHORT id)
    141145{
    142146    using namespace boost::adaptors;
    … …  
    161165}
    162166
    163 HMENU LoadMenu(HINSTANCE hinst, USHORT id)
     167HMENU LoadMenuAlt(HINSTANCE hinst, USHORT id)
    164168{
    165169    return LoadMenuIndirect(GetResource(hinst, id, RT_MENU));

  • branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.h

    r792 r793  
    77namespace ActiveBasic { namespace Resource {
    88
    9 HICON LoadIcon(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load = 0);
    10 HICON LoadIcon(HINSTANCE hinst, USHORT id);
     9HICON LoadIconAlt(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load = 0);
     10HICON LoadIconAlt(HINSTANCE hinst, USHORT id);
    1111
    12 HCURSOR LoadCursor(HINSTANCE hinst, USHORT id);
     12HCURSOR LoadCursorAlt(HINSTANCE hinst, USHORT id);
    1313
    14 boost::optional<std::wstring> LoadString(HINSTANCE hinst, USHORT id);
     14boost::optional<std::wstring> LoadStringAlt(HINSTANCE hinst, USHORT id);
    1515
    16 HACCEL LoadAccelerators(HINSTANCE hinst, USHORT id);
     16HACCEL LoadAcceleratorsAlt(HINSTANCE hinst, USHORT id);
    1717
    18 HMENU LoadMenu(HINSTANCE hinst, USHORT id);
     18HMENU LoadMenuAlt(HINSTANCE hinst, USHORT id);
    1919
    2020struct IconDeleter

  • branches/egtra/ab5.0/abdev/abdev/ChildWndOnRebar.cpp

    r784 r793  
    229229
    230230
    231 #define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_StandardToolbar->Add((id), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16), (lpszToolTip))
     231#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_StandardToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip))
    232232#define ADD_TOOLBAR_SEPARATOR pobj_StandardToolbar->Add(0,0,0)
    233233    //ボタン類を追加
    … …  
    279279    pobj_DebuggerToolbar->Create(hDebuggerToolbarPager);
    280280
    281 #define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_DebuggerToolbar->Add((id), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16), (lpszToolTip))
     281#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_DebuggerToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip))
    282282#define ADD_TOOLBAR_SEPARATOR pobj_DebuggerToolbar->Add(0,0,0)
    283283    //ボタン類を追加
    … …  
    327327    pobj_ReleaseToolbar->Create(hReleaseToolbarPager);
    328328
    329 #define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_ReleaseToolbar->Add((id), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16), (lpszToolTip))
     329#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_ReleaseToolbar->Add((id), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16), (lpszToolTip))
    330330#define ADD_TOOLBAR_SEPARATOR pobj_ReleaseToolbar->Add(0,0,0)
    331331    //ボタン類を追加

  • branches/egtra/ab5.0/abdev/abdev/Complement.cpp

    r786 r793  
    754754            hImageList=ImageList_Create(16, 16, ILC_COLOR24, 7, 0);
    755755            ListView_SetImageList(hListView, hImageList, LVSIL_SMALL);
    756             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PRIVATE_VARIABLE));
    757             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PUBLIC_VARIABLE));
    758             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PRIVATE_FUNCTION));
    759             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PUBLIC_FUNCTION));
    760             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_PAIRSTATEMENT));
    761             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_HTML_GENERAL_PARAMETER));
    762             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_HTML_PARAMETER));
     756            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_VARIABLE));
     757            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_VARIABLE));
     758            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_FUNCTION));
     759            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_FUNCTION));
     760            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_PAIRSTATEMENT));
     761            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_HTML_GENERAL_PARAMETER));
     762            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_HTML_PARAMETER));
    763763
    764764            return 0;

  • branches/egtra/ab5.0/abdev/abdev/DialogBoxes.cpp

    r789 r793  
    630630            ImageList_AddIcon(hImageList, LoadIcon(hInst, MAKEINTRESOURCE(IDI_FILE_BAS)));
    631631            ImageList_AddIcon(hImageList, LoadIcon(hInst, MAKEINTRESOURCE(IDI_FILE_SBP)));
    632             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_NEWFILE_PJ));
    633             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_NEWFILE_TEXT));
    634             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_NEWFILE_HTML));
    635             ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_NEWFILE_ICON));
     632            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_PJ));
     633            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_TEXT));
     634            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_HTML));
     635            ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_NEWFILE_ICON));
    636636
    637637
    … …  
    20392039#ifndef THETEXT
    20402040        //ライブラリ開発チーム
    2041         boost::optional<std::wstring> devGroup = ActiveBasic::Resource::LoadString(hResInst, IDS_DEV_GROUP);
     2041        boost::optional<std::wstring> devGroup = ActiveBasic::Resource::LoadStringAlt(hResInst, IDS_DEV_GROUP);
    20422042        if (devGroup)
    20432043        {

  • branches/egtra/ab5.0/abdev/abdev/DrawBuffer.cpp

    r784 r793  
    222222
    223223                if(bBreakPoint){
    224                     ActiveBasic::Resource::UniqueHIcon hicon(ActiveBasic::Resource::LoadIcon(hIconResInst, IDI_BREAKPOINT_FLAG, 16, 16));
     224                    ActiveBasic::Resource::UniqueHIcon hicon(ActiveBasic::Resource::LoadIconAlt(hIconResInst, IDI_BREAKPOINT_FLAG, 16, 16));
    225225                    DrawIconEx(memdc,3,i*font_height+(font_height-16)/2,hicon.get(),16,16,0,NULL,DI_NORMAL);
    226226                }

  • branches/egtra/ab5.0/abdev/abdev/FileTree.cpp

    r786 r793  
    160160    //イメージリスト読み込み、設定
    161161    hImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,3,0);
    162     ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FOLDER_CLOSE));
    163     ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FOLDER_OPEN));
    164     ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_TEXTDOCUMENT));
     162    ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_CLOSE));
     163    ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_OPEN));
     164    ImageList_AddIcon(hImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT));
    165165    this->SetImageList(hImageList,TVSIL_NORMAL);
    166166}

  • branches/egtra/ab5.0/abdev/abdev/IconEditor_Main.cpp

    r786 r793  
    11991199                InvalidateRect(hwnd,NULL,0);
    12001200
    1201                 SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_PEN));
     1201                SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_PEN));
    12021202            }
    12031203            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILL){
    … …  
    12141214                    InvalidateRect(hwnd,NULL,0);
    12151215                }
    1216                 SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_FILL));
     1216                SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_FILL));
    12171217            }
    12181218            else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE||
    … …  
    14961496                }
    14971497                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_PEN)
    1498                     SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_PEN));
     1498                    SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_PEN));
    14991499                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_FILL)
    1500                     SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_FILL));
     1500                    SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_FILL));
    15011501                else if(MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_LINE||
    15021502                    MdiInfo[WndNum]->MdiIconEditInfo->NowTool==IDC_TOOL_RECTANGLE||

  • branches/egtra/ab5.0/abdev/abdev/Print.cpp

    r786 r793  
    421421            //拡大・縮小アイコンを表示
    422422            SendDlgItemMessage(hwnd,IDC_ZOOMOUT,BM_SETIMAGE,IMAGE_ICON ,
    423                 reinterpret_cast<LPARAM>(ActiveBasic::Resource::LoadIcon(hResInst, IDI_ZOOMOUT, 16, 16, LR_SHARED)));
     423                reinterpret_cast<LPARAM>(ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_ZOOMOUT, 16, 16, LR_SHARED)));
    424424            SendDlgItemMessage(hwnd,IDC_ZOOMIN,BM_SETIMAGE,IMAGE_ICON ,
    425                 reinterpret_cast<LPARAM>(ActiveBasic::Resource::LoadIcon(hResInst, IDI_ZOOMIN, 16, 16, LR_SHARED)));
     425                reinterpret_cast<LPARAM>(ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_ZOOMIN, 16, 16, LR_SHARED)));
    426426            iZoomNowPage=ZOOM_INIT;
    427427

  • branches/egtra/ab5.0/abdev/abdev/ProjectControl.cpp

    r786 r793  
    466466            //イメージリスト読み込み、設定
    467467            hProcedureTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,8,0);
    468             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FOLDER_CLOSE));
    469             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FOLDER_OPEN));
    470             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_PROCEDURE));
    471             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_PROGRAM_FOLDER));
    472             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PUBLIC_VARIABLE));
    473             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PUBLIC_FUNCTION));
    474             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PRIVATE_VARIABLE));
    475             ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MEMBER_PRIVATE_FUNCTION));
     468            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_CLOSE));
     469            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_OPEN));
     470            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_PROCEDURE));
     471            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_PROGRAM_FOLDER));
     472            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_VARIABLE));
     473            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PUBLIC_FUNCTION));
     474            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_VARIABLE));
     475            ImageList_AddIcon(hProcedureTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MEMBER_PRIVATE_FUNCTION));
    476476            TreeView_SetImageList(hProcedureTreeView,hProcedureTreeViewImageList,TVSIL_NORMAL);
    477477
    … …  
    485485            //イメージリスト読み込み、設定
    486486            hMaterialTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,3,0);
    487             ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FOLDER_CLOSE));
    488             ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FOLDER_OPEN));
    489             ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_WINDOW));
    490             ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_MENU));
    491             ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FILE_ICON));
    492             ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FILE_BMP));
    493             ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIcon(hResInst, IDI_FILE_CURSOR));
     487            ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_CLOSE));
     488            ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FOLDER_OPEN));
     489            ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_WINDOW));
     490            ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_MENU));
     491            ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FILE_ICON));
     492            ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FILE_BMP));
     493            ImageList_AddIcon(hMaterialTreeViewImageList, ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_FILE_CURSOR));
    494494            TreeView_SetImageList(hMaterialTreeView,hMaterialTreeViewImageList,TVSIL_NORMAL);
    495495

  • branches/egtra/ab5.0/abdev/abdev/SubOperation.cpp

    r792 r793  
    838838    extern HICON hOwnerIcon,hBasicProgramIcon,hTextDocumentIcon,hWindowDocumentIcon;
    839839    hOwnerIcon=(HICON)LoadImage(hInst,MAKEINTRESOURCE(IDI_MAIN),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);
    840     hBasicProgramIcon=ActiveBasic::Resource::LoadIcon(hResInst, IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
    841     hTextDocumentIcon=ActiveBasic::Resource::LoadIcon(hResInst,IDI_TEXTDOCUMENT,16,16,LR_DEFAULTCOLOR);
    842     hWindowDocumentIcon=ActiveBasic::Resource::LoadIcon(hResInst,IDI_WINDOW,16,16,LR_DEFAULTCOLOR);
     840    hBasicProgramIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
     841    hTextDocumentIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT, 16, 16, LR_DEFAULTCOLOR);
     842    hWindowDocumentIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_WINDOW, 16, 16, LR_DEFAULTCOLOR);
    843843
    844844
    … …  
    846846
    847847    //メインメニュー
    848     pobj_MainMenu=new CMenuEx(ActiveBasic::Resource::LoadMenu(hResInst, IDR_MAINMENU));
     848    pobj_MainMenu=new CMenuEx(ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_MAINMENU));
    849849
    850850    pobj_MainMenu->InitOwnerDraw(1);            //オーナー描画の初期化
    … …  
    880880    }
    881881
    882 #define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon((itemID), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16));
     882#define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon((itemID), ActiveBasic::Resource::LoadIconAlt(hIconResInst, (iconID), 16, 16));
    883883    //メニューアイコンをセット
    884884
    … …  
    954954
    955955    extern HMENU hEditMenuBase,hEditMenu;
    956     hEditMenuBase=LoadMenu(hResInst,MAKEINTRESOURCE(IDR_EDITMENU));
     956    hEditMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_EDITMENU);
    957957    hEditMenu=GetSubMenu(hEditMenuBase,0);
    958958
    959959    extern HMENU hRebarMenuBase,hRebarMenu;
    960     hRebarMenuBase = ActiveBasic::Resource::LoadMenu(hResInst, IDR_REBARMENU);
     960    hRebarMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst, IDR_REBARMENU);
    961961    hRebarMenu=GetSubMenu(hRebarMenuBase,0);
    962962
    963963    extern HMENU hTabMenuBase,hTabMenu,hTabColorMenu;
    964     hTabMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_TABMENU);
     964    hTabMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_TABMENU);
    965965    hTabMenu=GetSubMenu(hTabMenuBase,0);
    966966    hTabColorMenu=GetSubMenu(hTabMenu,0);
    967967
    968968    extern HMENU hFileTreeMenuBase;
    969     hFileTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_FILETREEMENU);
     969    hFileTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_FILETREEMENU);
    970970
    971971    extern HMENU hProcedureTreeMenuBase;
    972     hProcedureTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_PROCEDURETREEMENU);
     972    hProcedureTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_PROCEDURETREEMENU);
    973973
    974974    extern HMENU hMaterialTreeMenuBase;
    975     hMaterialTreeMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_PROJECTVIEW_MATERIALTREEMENU);
     975    hMaterialTreeMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_PROJECTVIEW_MATERIALTREEMENU);
    976976
    977977    extern HMENU hRadMenuBase;
    978     hRadMenuBase = ActiveBasic::Resource::LoadMenu(hResInst,IDR_RADCONTEXTMENU);
     978    hRadMenuBase = ActiveBasic::Resource::LoadMenuAlt(hResInst,IDR_RADCONTEXTMENU);
    979979
    980980    //クリップボードのデータ形式（RAD用）を新規登録

  • branches/egtra/ab5.0/abdev/abdev/TextEditor_MouseEvent.cpp

    r786 r793  
    6969
    7070        //カーソルを矢印マークにする
    71         SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
     71        SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
    7272
    7373        GetNaturalCaretPos_Click(WndNum,
    … …  
    129129
    130130        //カーソルを矢印マークにする
    131         SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
     131        SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
    132132    }
    133133
    … …  
    255255
    256256            //カーソルを矢印マークにする
    257             SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
     257            SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
    258258
    259259            return;
    … …  
    321321
    322322        //カーソルを矢印マーク（デフォルト）にする
    323         SetCursor(ActiveBasic::Resource::LoadCursor(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
     323        SetCursor(ActiveBasic::Resource::LoadCursorAlt(hResInst, IDC_CURSOR_ARROW_TO_RIGHT));
    324324
    325325        return;

  • branches/egtra/ab5.0/abdev/abdev/abdev.cpp

    r791 r793  
    919919    else
    920920    {
    921         shfi.hIcon = ActiveBasic::Resource::LoadIcon(hResInst, IDI_TEXTDOCUMENT, 16, 16, LR_DEFAULTCOLOR);
     921        shfi.hIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT, 16, 16, LR_DEFAULTCOLOR);
    922922    }
    923923    mdic.lParam=(LPARAM)shfi.hIcon;
    … …  
    15521552    //return 0;
    15531553
    1554     hAccel = ActiveBasic::Resource::LoadAccelerators(hResInst, IDR_ACCELERATOR1);
     1554    hAccel = ActiveBasic::Resource::LoadAcceleratorsAlt(hResInst, IDR_ACCELERATOR1);
    15551555
    15561556    //メインウィンドウ
Note: See TracChangeset for help on using the changeset viewer.