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

Add checks for wxUSE_MENUBAR to wx/chkconf.h

Browse Source 
Check that it's defined in the first place and also check that
wxUSE_MENUS is on if wxUSE_MENUBAR is.
This commit is contained in:
Vadim Zeitlin
2020-07-14 18:10:45 +02:00
parent 6833b0e934
commit 5735e7227b
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/wx/chkconf.h
View File

@@ -927,6 +927,14 @@
# endif # endif
#endif /* !defined(wxUSE_MDI_ARCHITECTURE) */ #endif /* !defined(wxUSE_MDI_ARCHITECTURE) */
#ifndef wxUSE_MENUBAR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MENUBAR must be defined, please read comment near the top of this file."
# else
# define wxUSE_MENUBAR 0
# endif
#endif /* !defined(wxUSE_MENUBAR) */
#ifndef wxUSE_MENUS #ifndef wxUSE_MENUS
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MENUS must be defined, please read comment near the top of this file." # error "wxUSE_MENUS must be defined, please read comment near the top of this file."
@@ -2261,14 +2269,25 @@
# endif # endif
#endif /* wxUSE_SVG */ #endif /* wxUSE_SVG */
#if wxUSE_TASKBARICON && !wxUSE_MENUS #if !wxUSE_MENUS
# ifdef wxABORT_ON_CONFIG_ERROR # if wxUSE_MENUBAR
# error "wxUSE_TASKBARICON requires wxUSE_MENUS" # ifdef wxABORT_ON_CONFIG_ERROR
# else # error "wxUSE_MENUBAR requires wxUSE_MENUS"
# undef wxUSE_TASKBARICON # else
# define wxUSE_TASKBARICON 0 # undef wxUSE_MENUBAR
# endif # define wxUSE_MENUBAR 0
#endif /* wxUSE_TASKBARICON */ # endif
# endif /* wxUSE_MENUBAR */
# if wxUSE_TASKBARICON
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_TASKBARICON requires wxUSE_MENUS"
# else
# undef wxUSE_TASKBARICON
# define wxUSE_TASKBARICON 0
# endif
# endif /* wxUSE_TASKBARICON */
#endif /* !wxUSE_MENUS */
#if !wxUSE_VARIANT #if !wxUSE_VARIANT
# if wxUSE_DATAVIEWCTRL # if wxUSE_DATAVIEWCTRL