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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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));
Note: See TracChangeset for help on using the changeset viewer.