Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ugly icon of the generated shim #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed shim/icon.ico
Binary file not shown.
1 change: 0 additions & 1 deletion shim/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#define IDS_IMAGE_PATH 1
#define IDS_ARGS 2
#define IDS_CAPABILITIES 3
#define IDI_main 101
#define IDS_STRING102 102

// Next default values for new objects
Expand Down
10 changes: 0 additions & 10 deletions shim/shim.rc
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,6 @@ END

#endif // APSTUDIO_INVOKED


/////////////////////////////////////////////////////////////////////////////
//
// Icon
//

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_main ICON "icon.ico"

#endif // English (United Kingdom) resources
/////////////////////////////////////////////////////////////////////////////

Expand Down
3 changes: 0 additions & 3 deletions shim/shim.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,6 @@
<ItemGroup>
<ResourceCompile Include="shim.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="icon.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
1 change: 1 addition & 0 deletions shmake/resources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ void resources::replace_icon(const resources& other)
// todo: copy all icons - need to enumerate EnumResourceNames lpNames, not just the first resource

raw_copy(other, RT_ICON);
raw_copy(other, RT_GROUP_ICON);
}

void resources::open_for_edit()
Expand Down