#define IDS_RESELECT_FIRST 110
#define IDB_WINMERGE 202
#define IDB_WINMERGEDIR 203
+#define IDB_WINMERGE32 204
+#define IDB_WINMERGEDIR32 205
// Next default values for new objects
//
//\r
\r
IDB_WINMERGE BITMAP "WinMerge.bmp"\r
+IDB_WINMERGE32 BITMAP "WinMerge32.bmp"\r
IDB_WINMERGEDIR BITMAP "WinMergeDir.bmp"\r
+IDB_WINMERGEDIR32 BITMAP "WinMergeDir32.bmp"\r
\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
<CustomBuildStep Include="ShellExtensionU.def" />\r
<None Include="WinMerge.bmp" />\r
<None Include="WinMergeDir.bmp" />\r
- <None Include="WinMergeParent.bmp" />\r
<None Include="WinMergeShell.rgs" />\r
</ItemGroup>\r
<ItemGroup>\r
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">true</ExcludedFromBuild>\r
</ResourceCompile>\r
</ItemGroup>\r
+ <ItemGroup>\r
+ <Image Include="WinMerge32.bmp" />\r
+ <Image Include="WinMergeDir32.bmp" />\r
+ </ItemGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
</ImportGroup>\r
<None Include="WinMergeDir.bmp">\r
<Filter>Resource Files</Filter>\r
</None>\r
- <None Include="WinMergeParent.bmp">\r
- <Filter>Resource Files</Filter>\r
- </None>\r
</ItemGroup>\r
<ItemGroup>\r
<Midl Include="ShellExtension.idl">\r
<Filter>Source Files</Filter>\r
</CustomBuildStep>\r
</ItemGroup>\r
+ <ItemGroup>\r
+ <Image Include="WinMerge32.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </Image>\r
+ <Image Include="WinMergeDir32.bmp">\r
+ <Filter>Resource Files</Filter>\r
+ </Image>\r
+ </ItemGroup>\r
</Project>
\ No newline at end of file
CWinMergeShell::CWinMergeShell()
{
m_dwMenuState = 0;
+ int cx = GetSystemMetrics(SM_CXMENUCHECK);
+ int cy = GetSystemMetrics(SM_CYMENUCHECK);
+ int id_fileicon = cx > 16 ? IDB_WINMERGE32 : IDB_WINMERGE;
+ int id_diricon = cx > 16 ? IDB_WINMERGEDIR32 : IDB_WINMERGEDIR;
// compress or stretch icon bitmap according to menu item height
- HBITMAP hMergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGE), IMAGE_BITMAP,
- GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
- HBITMAP hMergeDirBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGEDIR), IMAGE_BITMAP,
- GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
+ HBITMAP hMergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(id_fileicon), IMAGE_BITMAP,
+ cx, cy, LR_DEFAULTCOLOR);
+ HBITMAP hMergeDirBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(id_diricon), IMAGE_BITMAP,
+ cx, cy, LR_DEFAULTCOLOR);
OSVERSIONINFO osvi;
osvi.dwOSVersionInfoSize = sizeof OSVERSIONINFO;