diff options
| -rw-r--r-- | examples/controlgallery.go | 1 | ||||
| -rw-r--r-- | examples/drawtext.go | 1 | ||||
| -rw-r--r-- | examples/histogram.go | 1 | ||||
| -rw-r--r-- | examples/table.go | 1 | ||||
| -rw-r--r-- | winmanifest/doc.go | 13 | ||||
| -rw-r--r-- | winmanifest/resources.rc | 9 | ||||
| -rw-r--r-- | winmanifest/ui.manifest (renamed from static.manifest) | 9 | ||||
| -rwxr-xr-x | winmanifest/winmanifest_windows_386.syso | bin | 0 -> 1956 bytes | |||
| -rwxr-xr-x | winmanifest/winmanifest_windows_amd64.syso | bin | 0 -> 1956 bytes |
9 files changed, 35 insertions, 0 deletions
diff --git a/examples/controlgallery.go b/examples/controlgallery.go index d77bebe..e2d2dc2 100644 --- a/examples/controlgallery.go +++ b/examples/controlgallery.go @@ -6,6 +6,7 @@ package main import ( "github.com/andlabs/ui" + _ "github.com/andlabs/ui/winmanifest" ) var mainwin *ui.Window diff --git a/examples/drawtext.go b/examples/drawtext.go index a32b14b..0aaeb7d 100644 --- a/examples/drawtext.go +++ b/examples/drawtext.go @@ -8,6 +8,7 @@ package main import ( "github.com/andlabs/ui" + _ "github.com/andlabs/ui/winmanifest" ) var ( diff --git a/examples/histogram.go b/examples/histogram.go index 610d65a..55a9f59 100644 --- a/examples/histogram.go +++ b/examples/histogram.go @@ -9,6 +9,7 @@ import ( "time" "github.com/andlabs/ui" + _ "github.com/andlabs/ui/winmanifest" ) var ( diff --git a/examples/table.go b/examples/table.go index 41cde9f..1d11f8d 100644 --- a/examples/table.go +++ b/examples/table.go @@ -16,6 +16,7 @@ import ( "bytes" "github.com/andlabs/ui" + _ "github.com/andlabs/ui/winmanifest" ) type modelHandler struct { diff --git a/winmanifest/doc.go b/winmanifest/doc.go new file mode 100644 index 0000000..71d6673 --- /dev/null +++ b/winmanifest/doc.go @@ -0,0 +1,13 @@ +// 2 september 2018 + +// Package winmanifest provides a basic manifest for use with +// package ui. You import it for its side effects only, as +// +// import _ "github.com/andlabs/ui/winmanifest" +// +// On non-Windows platforms this package does nothing. +// +// If you intend on using a custom manifest instead of the generic +// one in this package, be sure to read package ui's README so your +// manifest can have the directives necessary for package ui to work. +package winmanifest diff --git a/winmanifest/resources.rc b/winmanifest/resources.rc new file mode 100644 index 0000000..26f2b42 --- /dev/null +++ b/winmanifest/resources.rc @@ -0,0 +1,9 @@ +// 30 may 2015 + +// this is a UTF-8 file +#pragma code_page(65001) + +// this is the Common Controls 6 manifest +// TODO set up the string values here +// 1 is the value of CREATEPROCESS_MANIFEST_RESOURCE_ID and 24 is the value of RT_MANIFEST; we use it directly to avoid needing to share winapi.h with the tests and examples +1 24 "ui.manifest" diff --git a/static.manifest b/winmanifest/ui.manifest index d8e83a8..2dc9305 100644 --- a/static.manifest +++ b/winmanifest/ui.manifest @@ -26,6 +26,15 @@ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!--The ID below indicates application support for Windows 7 --> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + + <!-- The ones below are not needed for package ui, but are provided to avoid surprises when interoperating with other packages, or with the Go runtime itself; see also https://github.com/golang/go/issues/17835 --> + + <!--The ID below indicates application support for Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!--The ID below indicates application support for Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!--The ID below indicates application support for Windows 10 --> + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> </application> </compatibility> </assembly> diff --git a/winmanifest/winmanifest_windows_386.syso b/winmanifest/winmanifest_windows_386.syso Binary files differnew file mode 100755 index 0000000..93d1dc8 --- /dev/null +++ b/winmanifest/winmanifest_windows_386.syso diff --git a/winmanifest/winmanifest_windows_amd64.syso b/winmanifest/winmanifest_windows_amd64.syso Binary files differnew file mode 100755 index 0000000..64cfedd --- /dev/null +++ b/winmanifest/winmanifest_windows_amd64.syso |