diff --git a/3rdparty/wx.vcxproj b/3rdparty/wx.vcxproj index ceacfaf7..dc9117c2 100644 --- a/3rdparty/wx.vcxproj +++ b/3rdparty/wx.vcxproj @@ -1,4 +1,4 @@ - + @@ -156,7 +156,6 @@ Size true true - 4535 Windows @@ -180,7 +179,6 @@ Size true true - 4535 Windows @@ -197,6 +195,7 @@ + @@ -214,11 +213,12 @@ - + + @@ -232,6 +232,7 @@ + @@ -253,6 +254,7 @@ + @@ -262,6 +264,7 @@ + @@ -269,6 +272,7 @@ + @@ -277,11 +281,16 @@ + + + $(IntDir)\uilocale_common.obj + + @@ -331,6 +340,7 @@ + @@ -344,10 +354,15 @@ + + + + $(IntDir)\uilocale_msw.obj + diff --git a/3rdparty/wx.vcxproj.filters b/3rdparty/wx.vcxproj.filters index fd789d1c..9c730e35 100644 --- a/3rdparty/wx.vcxproj.filters +++ b/3rdparty/wx.vcxproj.filters @@ -40,6 +40,9 @@ Source Files + + Source Files + Source Files @@ -91,9 +94,6 @@ Source Files - - Source Files - Source Files @@ -106,6 +106,12 @@ Source Files + + Source Files + + + Source Files + Source Files @@ -145,6 +151,9 @@ Source Files + + Source Files + Source Files @@ -208,6 +217,9 @@ Source Files + + Source Files + Source Files @@ -235,6 +247,9 @@ Source Files + + Source Files + Source Files @@ -256,6 +271,9 @@ Source Files + + Source Files + Source Files @@ -280,6 +298,12 @@ Source Files + + Source Files + + + Source Files + Source Files @@ -295,6 +319,9 @@ Source Files + + Source Files + Source Files @@ -442,6 +469,9 @@ Source Files + + Source Files + Source Files @@ -481,6 +511,12 @@ Source Files + + Source Files + + + Source Files + Source Files @@ -493,6 +529,9 @@ Source Files + + Source Files + Source Files diff --git a/3rdparty/wxWidgets b/3rdparty/wxWidgets index 08ea09c7..a812fffd 160000 --- a/3rdparty/wxWidgets +++ b/3rdparty/wxWidgets @@ -1 +1 @@ -Subproject commit 08ea09c7fee69984c75e51ea8ee90ef075f06e90 +Subproject commit a812fffda3fe686c94e24bff27e8effd96e4de64 diff --git a/3rdparty/wxWidgets.bkl b/3rdparty/wxWidgets.bkl index 3c8e89af..23d59208 100644 --- a/3rdparty/wxWidgets.bkl +++ b/3rdparty/wxWidgets.bkl @@ -21,6 +21,7 @@ library WinSparkle_wx : t_3rdparty { src/common/arrstr.cpp src/common/artprov.cpp src/common/bmpbase.cpp + src/common/bmpbndl.cpp src/common/btncmn.cpp src/common/checkboxcmn.cpp src/common/clntdata.cpp @@ -38,12 +39,12 @@ library WinSparkle_wx : t_3rdparty { src/common/dlgcmn.cpp src/common/dobjcmn.cpp src/common/dpycmn.cpp - src/common/dynarray.cpp src/common/dynlib.cpp src/common/encconv.cpp src/common/event.cpp src/common/evtloopcmn.cpp src/common/extended.c + src/common/ffile.cpp src/common/file.cpp src/common/filefn.cpp src/common/filename.cpp @@ -57,6 +58,7 @@ library WinSparkle_wx : t_3rdparty { src/common/hash.cpp src/common/hashmap.cpp src/common/iconbndl.cpp + src/common/imagbmp.cpp src/common/image.cpp src/common/init.cpp src/common/intl.cpp @@ -78,6 +80,7 @@ library WinSparkle_wx : t_3rdparty { src/common/platinfo.cpp src/common/powercmn.cpp src/common/process.cpp + src/common/quantize.cpp src/common/rendcmn.cpp src/common/rgncmn.cpp src/common/settcmn.cpp @@ -87,6 +90,7 @@ library WinSparkle_wx : t_3rdparty { src/common/stdpbase.cpp src/common/stockitem.cpp src/common/strconv.cpp + src/common/stream.cpp src/common/string.cpp src/common/stringimpl.cpp src/common/stringops.cpp @@ -94,6 +98,7 @@ library WinSparkle_wx : t_3rdparty { src/common/sysopt.cpp src/common/textbuf.cpp src/common/textcmn.cpp + src/common/textentrycmn.cpp src/common/textmeasurecmn.cpp src/common/threadinfo.cpp src/common/time.cpp @@ -102,11 +107,14 @@ library WinSparkle_wx : t_3rdparty { src/common/tokenzr.cpp src/common/toplvcmn.cpp src/common/translation.cpp + src/common/txtstrm.cpp + src/common/uilocale.cpp src/common/unichar.cpp src/common/uri.cpp src/common/ustring.cpp src/common/utilscmn.cpp src/common/variant.cpp + src/common/wfstream.cpp src/common/wincmn.cpp src/common/windowid.cpp src/common/wrapsizer.cpp @@ -156,6 +164,7 @@ library WinSparkle_wx : t_3rdparty { src/msw/nativewin.cpp src/msw/nonownedwnd.cpp src/msw/ole/activex.cpp + src/msw/ole/comimpl.cpp src/msw/ole/dataobj.cpp src/msw/ole/oleutils.cpp src/msw/ole/safearray.cpp @@ -169,10 +178,13 @@ library WinSparkle_wx : t_3rdparty { src/msw/statbmp.cpp src/msw/stattext.cpp src/msw/stdpaths.cpp + src/msw/textctrl.cpp + src/msw/textentry.cpp src/msw/textmeasure.cpp src/msw/thread.cpp src/msw/timer.cpp src/msw/toplevel.cpp + src/msw/uilocale.cpp src/msw/utils.cpp src/msw/utilsexc.cpp src/msw/utilsgui.cpp diff --git a/3rdparty/wxWidgets_setup_h/wx/setup.h b/3rdparty/wxWidgets_setup_h/wx/setup.h index d0009aff..bcb299ef 100644 --- a/3rdparty/wxWidgets_setup_h/wx/setup.h +++ b/3rdparty/wxWidgets_setup_h/wx/setup.h @@ -184,7 +184,7 @@ // Unicode support // ---------------------------------------------------------------------------- -// These settings are obsolete: the library is always built in Unicode mode +// This option is deprecated: the library should be always built in Unicode mode // now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if // absolutely necessary -- updating it is strongly recommended as the ANSI mode // will disappear completely in future wxWidgets releases. @@ -192,9 +192,6 @@ #define wxUSE_UNICODE 1 #endif -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - // ---------------------------------------------------------------------------- // global features // ---------------------------------------------------------------------------- @@ -271,7 +268,7 @@ // Default is 1 // // Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 0 +#define wxUSE_STREAMS 1 // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. // Note that if the system's implementation does not support positional @@ -401,18 +398,6 @@ // wxWidgets. #define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -456,7 +441,7 @@ // Recommended setting: 1 (wxFile is highly recommended as it is required by // i18n code, wxFileConfig and others) #define wxUSE_FILE 1 -#define wxUSE_FFILE 0 +#define wxUSE_FFILE 1 // Use wxFSVolume class providing access to the configured/active mount points // @@ -472,6 +457,14 @@ // Recommended setting: 1 (but may be safely disabled if you don't use it) #define wxUSE_SECRETSTORE 0 +// Allow the use of the OS built-in spell checker in wxTextCtrl. +// +// Default is 1, the corresponding wxTextCtrl functions simply won't do +// anything if the functionality is not supported by the current platform. +// +// Recommended setting: 1 unless you want to save a tiny bit of code. +#define wxUSE_SPELLCHECK 0 + // Use wxStandardPaths class which allows to retrieve some standard locations // in the file system // @@ -522,7 +515,7 @@ // Recommended setting: 1 #define wxUSE_TIMER 1 -// Use wxStopWatch clas. +// Use wxStopWatch class. // // Default is 1 // @@ -586,13 +579,9 @@ // Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) // -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// // Default is 1. // -// Recommended setting: 1 if you need IPv6 support +// Recommended setting: 1. #define wxUSE_IPV6 0 // Set to 1 to enable virtual file systems (required by wxHTML) @@ -620,6 +609,22 @@ // wxUSE_LIBPNG #define wxUSE_ZLIB 0 +// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream +// classes. +// +// Notice that if you enable this build option when not using configure or +// CMake, you need to ensure that liblzma headers and libraries are available +// (i.e. by building the library yourself or downloading its binaries) and can +// be found, either by copying them to one of the locations searched by the +// compiler/linker by default (e.g. any of the directories in the INCLUDE or +// LIB environment variables, respectively, when using MSVC) or modify the +// make- or project files to add references to these directories. +// +// Default is 0 under MSW, auto-detected by configure. +// +// Recommended setting: 1 if you need LZMA compression. +#define wxUSE_LIBLZMA 0 + // If enabled, the code written by Apple will be used to write, in a portable // way, float on the disk. See extended.c for the license which is different // from wxWidgets one. @@ -641,6 +646,38 @@ // wxMimeTypesManager class #define wxUSE_MIMETYPE 0 +// wxWebRequest allows usage of system libraries for HTTP(S) requests. +// +// Note that for wxWebRequest to be built, at least one of its backends must be +// available. Under MSW and macOS this will always be the case unless +// explicitly disabled. +// +// Default is 1 +// +// Recommended setting: 1, setting it to 0 may be useful to avoid dependencies +// on libcurl on Unix systems. +#define wxUSE_WEBREQUEST 0 + +// wxWebRequest backend based on NSURLSession +// +// Default is 1 under macOS. +// +// Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1, +// otherwise wxWebRequest won't be available at all under Mac. +#ifdef __APPLE__ +#define wxUSE_WEBREQUEST_URLSESSION wxUSE_WEBREQUEST +#else +#define wxUSE_WEBREQUEST_URLSESSION 0 +#endif + +// wxWebRequest backend based on libcurl, can be used under all platforms. +// +// Default is 0 for MSW and macOS, detected automatically when using configure. +// +// Recommended setting: 0 on Windows and macOS, otherwise 1 as it is required +// for wxWebRequest to be available at all. +#define wxUSE_WEBREQUEST_CURL 0 + // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP // or wxURL you need to set this to 1. // @@ -717,10 +754,10 @@ // XML parsing classes. Note that their API will change in the future, so // using wxXmlDocument and wxXmlNode in your app is not recommended. // -// Default is the same as wxUSE_XRC, i.e. 1 by default. +// Default is 1 // // Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC +#define wxUSE_XML 0 // Use wxWidget's AUI docking system // @@ -768,6 +805,20 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 because WebView2 is not always available, set it to 1 if you do have it. +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + +// Use the Edge (Chromium) wxWebView backend without loader DLL +// +// Default is 0, set it to 1 if you don't want to depend on WebView2Loader.dll. +// +// Recommended setting: 0 +#define wxUSE_WEBVIEW_EDGE_STATIC 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX @@ -910,12 +961,20 @@ #define wxUSE_STATLINE 0 // wxStaticLine #define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 0 // wxTextCtrl +#define wxUSE_TEXTCTRL 1 // wxTextCtrl #define wxUSE_TIMEPICKCTRL 0 // wxTimePickerCtrl #define wxUSE_TOGGLEBTN 0 // requires wxButton #define wxUSE_TREECTRL 0 // wxTreeCtrl #define wxUSE_TREELISTCTRL 0 // wxTreeListCtrl +// Use generic version of wxDataViewCtrl even if a native one is available? +// +// Default is 1. +// +// Recommended setting: 1, but can be set to 0 if your program is affected by +// the native control limitations. +#define wxUSE_NATIVE_DATAVIEWCTRL 0 + // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // @@ -1015,7 +1074,7 @@ // Default is 1. // // Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox +// is used by wxComboBox #define wxUSE_COMBOCTRL 0 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox @@ -1115,13 +1174,20 @@ // depends on it) #define wxUSE_INFOBAR 0 -// Use wxMenu, wxMenuBar, wxMenuItem. +// Use wxMenu, wxMenuItem. // // Default is 1. // // Recommended setting: 1 (can't be disabled under MSW) #define wxUSE_MENUS 1 +// Use wxMenuBar. +// +// Default is 1. +// +// Recommended setting: 1 (can't be disabled under MSW) +#define wxUSE_MENUBAR 1 + // Use wxNotificationMessage. // // wxNotificationMessage allows to show non-intrusive messages to the user @@ -1279,6 +1345,9 @@ // number entry dialog #define wxUSE_NUMBERDLG 0 +// credential entry dialog +#define wxUSE_CREDENTIALDLG 0 + // splash screen class #define wxUSE_SPLASH 0 @@ -1367,6 +1436,14 @@ // otherwise. #define wxUSE_GLCANVAS 0 +// Setting wxUSE_GLCANVAS_EGL to 1 enables OpenGL EGL backend. This will be +// automatically enabled if EGL support is detected. EGL support is only +// available under Unix platforms. +// +// Default is 0. +// +#define wxUSE_GLCANVAS_EGL 0 + // wxRichTextCtrl allows editing of styled text. // // Default is 1. @@ -1508,6 +1585,12 @@ // Set to 1 for TIFF format support (requires libtiff) #define wxUSE_LIBTIFF 0 +// Set to 1 for SVG rasterizing support using nanosvg +#define wxUSE_NANOSVG 0 + +// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled +#define wxUSE_NANOSVG_EXTERNAL 0 + // Set to 1 for TGA format support (loading only) #define wxUSE_TGA 0 @@ -1547,12 +1630,11 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ /* --- start MSW options --- */ // ---------------------------------------------------------------------------- -// Graphics backends choices for Windows +// Windows-specific backends choices // ---------------------------------------------------------------------------- // The options here are only taken into account if wxUSE_GRAPHICS_CONTEXT is 1. @@ -1580,6 +1662,16 @@ #define wxUSE_GRAPHICS_DIRECT2D 0 #endif +// wxWebRequest backend based on WinHTTP. +// +// This is only taken into account if wxUSE_WEBREQUEST==1. +// +// Default is 1 if supported by the compiler (MSVS or MinGW64). +// +// Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1, +// otherwise wxWebRequest won't be available at all. +#define wxUSE_WEBREQUEST_WINHTTP 0 + // ---------------------------------------------------------------------------- // Windows-only settings // ---------------------------------------------------------------------------- @@ -1624,7 +1716,7 @@ // Set this to 1 to enable wxDIB class used internally for manipulating // wxBitmap data. // -// Default is 1, set it to 0 only if you don't use wxImage neither +// Default is 1, set it to 0 only if you don't use wxImage either // // Recommended setting: 1 (without it conversion to/from wxImage won't work) #define wxUSE_WXDIB 1 @@ -1688,6 +1780,13 @@ // Recommended setting: 0, nobody uses .INI files any more #define wxUSE_INICONF 0 +// Set to 0 if you need to include rather than +// +// Default is 1. +// +// Recommended setting: 1, required to be 1 if wxUSE_IPV6 is 1. +#define wxUSE_WINSOCK2 0 + // ---------------------------------------------------------------------------- // Generic versions of native controls // ---------------------------------------------------------------------------- @@ -1734,4 +1833,3 @@ /* --- end MSW options --- */ #endif // _WX_SETUP_H_ - diff --git a/WinSparkle.sln b/WinSparkle.sln index 96b97950..1e3f9207 100644 --- a/WinSparkle.sln +++ b/WinSparkle.sln @@ -1,16 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30104.148 +# Visual Studio 17 +VisualStudioVersion = 17.0.31919.166 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinSparkle", "WinSparkle.vcxproj", "{524CCCF2-61EA-5B64-A1D9-FF5497027B5F}" ProjectSection(ProjectDependencies) = postProject {47B228CB-24FE-5250-B1FC-DFC81D3E69DF} = {47B228CB-24FE-5250-B1FC-DFC81D3E69DF} + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70} = {A0326E8B-57A0-548E-AB4A-2DB2B6704D70} {499A5238-5AAC-5FD3-8902-819D787108A5} = {499A5238-5AAC-5FD3-8902-819D787108A5} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinSparkle_expat", "3rdparty\expat.vcxproj", "{47B228CB-24FE-5250-B1FC-DFC81D3E69DF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinSparkle_libcrypto", "3rdparty\libcrypto.vcxproj", "{A0326E8B-57A0-548E-AB4A-2DB2B6704D70}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinSparkle_wx", "3rdparty\wx.vcxproj", "{499A5238-5AAC-5FD3-8902-819D787108A5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_psdk", "examples\example_psdk.vcxproj", "{AFBD6C55-82AB-5746-BABD-D254BE893418}" @@ -20,8 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_psdk", "examples\ex EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{2C4E4846-FF11-55AD-AFD1-BC1F3AF74724}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinSparkle_libcrypto", "3rdparty\libcrypto.vcxproj", "{A0326E8B-57A0-548E-AB4A-2DB2B6704D70}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -46,6 +47,14 @@ Global {47B228CB-24FE-5250-B1FC-DFC81D3E69DF}.Release|Win32.Build.0 = Release|Win32 {47B228CB-24FE-5250-B1FC-DFC81D3E69DF}.Release|x64.ActiveCfg = Release|x64 {47B228CB-24FE-5250-B1FC-DFC81D3E69DF}.Release|x64.Build.0 = Release|x64 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|Win32.ActiveCfg = Debug|Win32 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|Win32.Build.0 = Debug|Win32 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|x64.ActiveCfg = Debug|x64 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|x64.Build.0 = Debug|x64 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|Win32.ActiveCfg = Release|Win32 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|Win32.Build.0 = Release|Win32 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|x64.ActiveCfg = Release|x64 + {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|x64.Build.0 = Release|x64 {499A5238-5AAC-5FD3-8902-819D787108A5}.Debug|Win32.ActiveCfg = Debug|Win32 {499A5238-5AAC-5FD3-8902-819D787108A5}.Debug|Win32.Build.0 = Debug|Win32 {499A5238-5AAC-5FD3-8902-819D787108A5}.Debug|x64.ActiveCfg = Debug|x64 @@ -62,24 +71,13 @@ Global {AFBD6C55-82AB-5746-BABD-D254BE893418}.Release|Win32.Build.0 = Release|Win32 {AFBD6C55-82AB-5746-BABD-D254BE893418}.Release|x64.ActiveCfg = Release|x64 {AFBD6C55-82AB-5746-BABD-D254BE893418}.Release|x64.Build.0 = Release|x64 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|Win32.ActiveCfg = Debug|Win32 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|Win32.Build.0 = Debug|Win32 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|x64.ActiveCfg = Debug|x64 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Debug|x64.Build.0 = Debug|x64 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|Win32.ActiveCfg = Release|Win32 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|Win32.Build.0 = Release|Win32 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|x64.ActiveCfg = Release|x64 - {A0326E8B-57A0-548E-AB4A-2DB2B6704D70}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {47B228CB-24FE-5250-B1FC-DFC81D3E69DF} = {2C4E4846-FF11-55AD-AFD1-BC1F3AF74724} - {499A5238-5AAC-5FD3-8902-819D787108A5} = {2C4E4846-FF11-55AD-AFD1-BC1F3AF74724} {A0326E8B-57A0-548E-AB4A-2DB2B6704D70} = {2C4E4846-FF11-55AD-AFD1-BC1F3AF74724} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {11AC83A1-8DBC-46BE-94E3-26DBCEEFD609} + {499A5238-5AAC-5FD3-8902-819D787108A5} = {2C4E4846-FF11-55AD-AFD1-BC1F3AF74724} EndGlobalSection EndGlobal diff --git a/WinSparkle.vcxproj b/WinSparkle.vcxproj index 8f1b07b4..b2ed54c8 100644 --- a/WinSparkle.vcxproj +++ b/WinSparkle.vcxproj @@ -1,4 +1,4 @@ - + @@ -37,8 +37,8 @@ v140_xp v141_xp v142 - false v143 + false DynamicLibrary @@ -49,8 +49,8 @@ v140 v141 v142 - false v143 + false DynamicLibrary @@ -61,9 +61,9 @@ v140_xp v141_xp v142 + v143 false true - v143 DynamicLibrary @@ -74,9 +74,9 @@ v140 v141 v142 + v143 false true - v143 diff --git a/examples/examples.sln b/examples/examples.sln index 31eb4062..258322f6 100644 --- a/examples/examples.sln +++ b/examples/examples.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 16 -VisualStudioVersion = 16.0.29020.237 +# Visual Studio 17 +VisualStudioVersion = 17.0.31919.166 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_psdk", "example_psdk.vcxproj", "{AFBD6C55-82AB-5746-BABD-D254BE893418}" ProjectSection(ProjectDependencies) = postProject diff --git a/src/ui.cpp b/src/ui.cpp index 447a5fe0..e1d76575 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -113,9 +113,7 @@ wxIcon LoadNamedIcon(HMODULE module, const wchar_t *iconName, int size) return wxNullIcon; wxIcon icon; - icon.SetHICON(static_cast(hIcon)); - icon.SetWidth(size); - icon.SetHeight(size); + icon.InitFromHICON(static_cast(hIcon), size, size); return icon; }