cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify defining manifest in wx.rc

Browse Source 
Avoid complicated preprocessor manipulations not needed any more since
the simplifications of 10d2354125 (Merge branch
'simplify-application-manifests', 2021-12-18).

See #23057, #23065.

(cherry picked from commit ddea807a2a904c7c5e0b0ac2a274ee8480eb5ce0)
This commit is contained in:
Maarten Bent 2022-12-22 16:19:57 +01:00 committed by Vadim Zeitlin
parent 2efb6e748a
commit 4705cb3a7a
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -277,6 +277,7 @@ wxMSW:
- Set wxUSE_TASKBARBUTTON correctly when building using configure (#22900).
- Queue wxWebViewEdge events to avoid hangs (Tobias Taschner, #23025).
- Fix getting printer information in the print dialog (Stefan Ziegler, #23068).
- Fix building samples with clang under MSYS (Maarten Bent, #23057).
wxOSX:

17
include/wx/msw/wx.rc
View File

@ -106,22 +106,11 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
#endif
#if !defined(wxUSE_DPI_AWARE_MANIFEST) || wxUSE_DPI_AWARE_MANIFEST == 0
#define wxMANIFEST_DPI .manifest
#define wxMANIFEST_FILE "wx/msw/wx.manifest"
#elif wxUSE_DPI_AWARE_MANIFEST == 1
#define wxMANIFEST_DPI _dpi_aware.manifest
#define wxMANIFEST_FILE "wx/msw/wx_dpi_aware.manifest"
#elif wxUSE_DPI_AWARE_MANIFEST == 2
#define wxMANIFEST_DPI _dpi_aware_pmv2.manifest
#endif
#define wxRC_STR(text) wxRC_STR2(text)
#define wxRC_STR2(text) #text
#define wxRC_CONCAT(a, b) wxRC_CONCAT2(a, b)
#define wxRC_CONCAT2(a, b) a ## b
#ifdef __GNUC__
#define wxMANIFEST_FILE "wx/msw/wx" wxRC_STR(wxMANIFEST_DPI)
#else
#define wxMANIFEST_FILE wxRC_CONCAT(wx/msw/wx, wxMANIFEST_DPI)
#define wxMANIFEST_FILE "wx/msw/wx_dpi_aware_pmv2.manifest"
#endif
wxMANIFEST_ID RT_MANIFEST wxMANIFEST_FILE