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

Merge pull request #844 from catalinr/Qt_build_fixes_2

Browse Source 
wxQt build fixes
This commit is contained in:
VZ
2018-06-28 00:38:15 +02:00
committed by GitHub
parent 60669e9b50 fc7cae9825
commit 7331903f56
13 changed files with 96 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/chkconf.h
View File

@@ -1721,6 +1721,11 @@
# endif
#endif
#if wxUSE_ACTIVITYINDICATOR && !wxUSE_GRAPHICS_CONTEXT
# undef wxUSE_ACTIVITYINDICATOR
# define wxUSE_ACTIVITYINDICATOR 0
#endif /* wxUSE_ACTIVITYINDICATOR */
#if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY"
@@ -1737,7 +1742,7 @@
# undef wxUSE_DC_TRANSFORM_MATRIX
# define wxUSE_DC_TRANSFORM_MATRIX 0
# endif
#endif /* wxUSE_GRAPHICS_CONTEXT */
#endif /* wxUSE_DC_TRANSFORM_MATRIX */
/* generic controls dependencies */
#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)