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


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

icon_resをLOAD_LIBRARY_AS_DATAFILE付きで読み込むよう変更。icon_resプロジェクトをab.slnへ組み込んだ。

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

Legend:

Unmodified
Added
Removed

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

    r629 r784  
    229229
    230230
    231 #define ADD_TOOLBAR_BUTTON(id,iconID,lpszToolTip) pobj_StandardToolbar->Add(id,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)
     231#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_StandardToolbar->Add((id), ActiveBasic::Resource::LoadIcon(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,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)
     281#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_DebuggerToolbar->Add((id), ActiveBasic::Resource::LoadIcon(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,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0),lpszToolTip)
     329#define ADD_TOOLBAR_BUTTON(id, iconID, lpszToolTip) pobj_ReleaseToolbar->Add((id), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16), (lpszToolTip))
    330330#define ADD_TOOLBAR_SEPARATOR pobj_ReleaseToolbar->Add(0,0,0)
    331331    //ボタン類を追加

  • branches/egtra/ab5.0/abdev/abdev/Common.h

    r772 r784  
    3333#include "Debugger.h"
    3434
     35#include <Resource/Load.h>
    3536
    3637#pragma comment(lib, "wininet.lib")

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

    r778 r784  
    222222
    223223                if(bBreakPoint){
    224                     DrawIconEx(memdc,3,i*font_height+(font_height-16)/2,
    225                         (HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(IDI_BREAKPOINT_FLAG),IMAGE_ICON,16,16,LR_SHARED),
    226                         16,16,0,NULL,DI_NORMAL);
     224                    ActiveBasic::Resource::UniqueHIcon hicon(ActiveBasic::Resource::LoadIcon(hIconResInst, IDI_BREAKPOINT_FLAG, 16, 16));
     225                    DrawIconEx(memdc,3,i*font_height+(font_height-16)/2,hicon.get(),16,16,0,NULL,DI_NORMAL);
    227226                }
    228227                else{

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

    r772 r784  
    692692    const std::string resDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\res.dll";
    693693    hResInst = LoadLibrary( resDllPath.c_str() );
     694    if(!hResInst){
     695        MessageBox(0,"res.dllの読み込みに失敗しました。",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION);
     696        return 0;
     697    }
    694698
    695699    //アイコンリソースDLLをマッピング
    696700    const std::string iconResDllPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\icon_res.dll";
    697     hIconResInst = LoadLibrary( iconResDllPath.c_str() );
     701    hIconResInst = LoadLibraryEx( iconResDllPath.c_str(), nullptr, LOAD_LIBRARY_AS_DATAFILE );
     702    if(!hIconResInst){
     703        MessageBox(0,"icon_res.dllの読み込みに失敗しました。",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION);
     704        return 0;
     705    }
    698706
    699707    //LuxCtrl.dllをマッピング
    … …  
    872880    }
    873881
    874 #define ICONSET(itemID,iconID) pobj_MainMenu->SetIcon(itemID,(HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(iconID),IMAGE_ICON,16,16,0));
     882#define ICONSET(itemID, iconID) pobj_MainMenu->SetIcon((itemID), ActiveBasic::Resource::LoadIcon(hIconResInst, (iconID), 16, 16));
    875883    //メニューアイコンをセット
    876884

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

    r781 r784  
    5454    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    5555    <Import Project="..\ab-common-32.props" />
     56    <Import Project="..\ab-common.props" />
    5657  </ImportGroup>
    5758  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    … …  
    5960    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
    6061    <Import Project="..\ab-common-32.props" />
     62    <Import Project="..\ab-common.props" />
    6163  </ImportGroup>
    6264  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    6365    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6466    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     67    <Import Project="..\ab-common.props" />
    6568  </ImportGroup>
    6669  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6770    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6871    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
     72    <Import Project="..\ab-common.props" />
    6973  </ImportGroup>
    7074  <PropertyGroup Label="UserMacros" />
    … …  
    97101      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    98102      <Optimization>Disabled</Optimization>
    99       <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    100103      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    101104      <MinimalRebuild>false</MinimalRebuild>
    … …  
    104107      <PrecompiledHeader>Use</PrecompiledHeader>
    105108      <WarningLevel>Level3</WarningLevel>
    106       <SuppressStartupBanner>true</SuppressStartupBanner>
    107       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     109      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    108110    </ClCompile>
    109111    <ResourceCompile>
    … …  
    140142      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    141143      <Optimization>Disabled</Optimization>
    142       <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    143144      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    144145      <MinimalRebuild>false</MinimalRebuild>
    … …  
    147148      <PrecompiledHeader>Use</PrecompiledHeader>
    148149      <WarningLevel>Level3</WarningLevel>
    149       <SuppressStartupBanner>true</SuppressStartupBanner>
    150       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     150      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    151151    </ClCompile>
    152152    <ResourceCompile>
    … …  
    182182      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    183183      <Optimization>MinSpace</Optimization>
    184       <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    185184      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x040A;_WIN32_WINNT=0x0403;_WIN32_WINDOWS=0x0400;_WIN32_IE=0x0401;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    186185      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    187186      <PrecompiledHeader>Use</PrecompiledHeader>
    188187      <WarningLevel>Level3</WarningLevel>
    189       <SuppressStartupBanner>true</SuppressStartupBanner>
    190       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     188      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    191189    </ClCompile>
    192190    <ResourceCompile>
    … …  
    226224      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
    227225      <Optimization>MinSpace</Optimization>
    228       <AdditionalIncludeDirectories>..\..\;..\..\cpplibs;..\..\cpplibs\boost;..\..\cpplibs\WTL80\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    229226      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JPN;WINVER=0x0501;_WIN32_WINNT=0x0501;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    230227      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    231228      <PrecompiledHeader>Use</PrecompiledHeader>
    232229      <WarningLevel>Level3</WarningLevel>
    233       <SuppressStartupBanner>true</SuppressStartupBanner>
    234       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     230      <AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    235231    </ClCompile>
    236232    <ResourceCompile>
Note: See TracChangeset for help on using the changeset viewer.