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

Merge branch 'samples-dpi-v2-aware'

Browse Source 
Build all samples, not just one of them, as per-monitor DPI v2 programs
under MSW and minor cleanup of the samples .rc files.

See https://github.com/wxWidgets/wxWidgets/pull/2557
This commit is contained in:
Vadim Zeitlin 2021-10-25 13:16:55 +02:00
commit 3d5664cabe
16 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/animate/anitest.bkl
View File

@ -8,7 +8,6 @@
<headers>anitest.h</headers>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
<wx-data id="catalog">

2
samples/calendar/calendar.rc
View File

@ -1,2 +0,0 @@
#include "wx/msw/wx.rc"

1
samples/collpane/collpane.bkl
View File

@ -7,7 +7,6 @@
<sources>collpane.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

1
samples/dataview/dataview.bkl
View File

@ -8,7 +8,6 @@
<headers>mymodels.h</headers>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

1
samples/popup/popup.bkl
View File

@ -6,6 +6,5 @@
<sources>popup.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

1
samples/propgrid/propgrid.bkl
View File

@ -17,7 +17,6 @@
<wx-lib>propgrid</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

1
samples/ribbon/ribbon.bkl
View File

@ -10,7 +10,6 @@
<wx-lib>ribbon</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

1
samples/richtext/richtext.bkl
View File

@ -12,7 +12,6 @@
<wx-lib>core</wx-lib>
<wx-lib>xml</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

3
samples/sample.rc
View File

@ -25,6 +25,9 @@ sample ICON "sample.ico"
// for more information)
#define wxUSE_NO_MANIFEST 0
// To get DPI change events, we need to opt in into per monitor DPI support.
#define wxUSE_DPI_AWARE_MANIFEST 2
// this is not always needed but doesn't hurt (except making the executable
// very slightly larger): this file contains the standard icons, cursors, ...
#include "wx/msw/wx.rc"

1
samples/splash/splash.bkl
View File

@ -9,7 +9,6 @@
<wx-lib>media</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
<wx-data id="data">

3
samples/toolbar/toolbar.rc
View File

@ -1,6 +1,3 @@
// To get DPI change events, we need to opt in into per monitor DPI support.
#define wxUSE_DPI_AWARE_MANIFEST 2
#include "../sample.rc"
new RCDATA "bitmaps/new.png"

1
samples/treectrl/treectrl.bkl
View File

@ -8,7 +8,6 @@
<headers>treetest.h</headers>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

1
samples/validate/validate.bkl
View File

@ -8,7 +8,6 @@
<headers>validate.h</headers>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

1
samples/webview/webview.bkl
View File

@ -12,7 +12,6 @@
<wx-lib>stc</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
<sys-lib>$(LIB_SCINTILLA)</sys-lib>
</if>

1
samples/widgets/widgets.bkl
View File

@ -59,7 +59,6 @@
<headers>widgets.h itemcontainer.h</headers>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>../sample.rc</win32-res>
</exe>
</makefile>

3
samples/xti/xti.rc
View File

@ -1,3 +0,0 @@
mondrian ICON "sample.ico"
#include "wx/msw/wx.rc"