AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add dependency of generic wxDatePickerCtrl on wxComboCtrl

Browse Source 
The generic implementation requires wxComboCtrl, so pull it in if
wxDatePickerCtrl is enabled.

Explicitly testing for the platform here is ugly, as it duplicates the checks
in wx/datectrl.h and will get out of date when/if they're changed there, but
there just doesn't seem to be any other way.

See #17159.
This commit is contained in:
Andreas Falkenhahn 2015-09-20 13:51:04 +02:00 committed by Vadim Zeitlin
parent bf41f447bf
commit e37842419e
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/chkconf.h
View File

@ -1781,6 +1781,20 @@
# endif # endif
#endif /* wxUSE_CALENDARCTRL */ #endif /* wxUSE_CALENDARCTRL */
#if wxUSE_DATEPICKCTRL
/* Only the generic implementation, not used under MSW and OSX, needs
* wxComboCtrl. */
# if !wxUSE_COMBOCTRL && (defined(__WXUNIVERSAL__) || \
!(defined(__WXMSW__) || defined(__WXOSX_COCOA__)))
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxDatePickerCtrl requires wxUSE_COMBOCTRL"
# else
# undef wxUSE_COMBOCTRL
# define wxUSE_COMBOCTRL 1
# endif
# endif
#endif /* wxUSE_DATEPICKCTRL */
#if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL #if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL
# if !wxUSE_DATETIME # if !wxUSE_DATETIME
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR