added new and improved wxFileCtrl implementation (patch 1763164)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -511,6 +511,14 @@
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */
|
||||
|
||||
#ifndef wxUSE_FILECTRL
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_FILECTRL must be defined."
|
||||
# else
|
||||
# define wxUSE_FILECTRL 0
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_FILECTRL) */
|
||||
|
||||
#ifndef wxUSE_FILEDLG
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_FILEDLG must be defined."
|
||||
@@ -1417,6 +1425,17 @@
|
||||
# endif
|
||||
#endif /* !wxMSW || wxUniv */
|
||||
|
||||
/* generic file dialog depends on (generic) file control */
|
||||
#if wxUSE_FILEDLG && !wxUSE_FILECTRL && \
|
||||
(defined(__WXUNIVERSAL__) || defined(__WXGTK__))
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "Generic wxFileDialog requires wxFileCtrl"
|
||||
# else
|
||||
# undef wxUSE_FILECTRL
|
||||
# define wxUSE_FILECTRL 1
|
||||
# endif
|
||||
#endif /* wxUSE_FILEDLG */
|
||||
|
||||
/* common dependencies */
|
||||
#if wxUSE_CALENDARCTRL
|
||||
# if !(wxUSE_SPINBTN && wxUSE_COMBOBOX)
|
||||
|
Reference in New Issue
Block a user