split wxUSE_MDI from wxUSE_MDI_ARCHITECTURE (which is wxUSE_MDI + wxUSE_DOCVIEW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
15
configure.in
15
configure.in
@@ -437,6 +437,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_DRAGIMAGE=no
|
||||
DEFAULT_wxUSE_SPLINES=no
|
||||
|
||||
DEFAULT_wxUSE_MDI=no
|
||||
DEFAULT_wxUSE_MDI_ARCHITECTURE=no
|
||||
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
|
||||
DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
|
||||
@@ -619,6 +620,7 @@ else
|
||||
DEFAULT_wxUSE_DRAGIMAGE=yes
|
||||
DEFAULT_wxUSE_SPLINES=yes
|
||||
|
||||
DEFAULT_wxUSE_MDI=yes
|
||||
DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
|
||||
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
|
||||
DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
|
||||
@@ -908,7 +910,8 @@ WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], w
|
||||
WX_ARG_ENABLE(htmlhelp, [ --enable-htmlhelp use wxHTML-based help], wxUSE_WXHTML_HELP)
|
||||
WX_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS)
|
||||
WX_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
|
||||
WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
|
||||
WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI)
|
||||
WX_ARG_ENABLE(mdidoc, [ --enable-mdidoc use docview architecture with MDI], wxUSE_MDI_ARCHITECTURE)
|
||||
WX_ARG_ENABLE(loggui, [ --enable-loggui use standard GUI logger], wxUSE_LOGGUI)
|
||||
WX_ARG_ENABLE(logwin, [ --enable-logwin use wxLogWindow], wxUSE_LOGWINDOW)
|
||||
WX_ARG_ENABLE(logdialog, [ --enable-logdialog use wxLogDialog], wxUSE_LOGDIALOG)
|
||||
@@ -5096,9 +5099,13 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
|
||||
if test "$wxUSE_MDI" = "yes"; then
|
||||
AC_DEFINE(wxUSE_MDI)
|
||||
|
||||
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
|
||||
|
Reference in New Issue
Block a user