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

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
+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

include/wx/chkconf.h

@@ -496,6 +496,14 @@
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */
 
+#ifndef wxUSE_MDI
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_MDI must be defined."
+#   else
+#       define wxUSE_MDI 0
+#   endif
+#endif /* !defined(wxUSE_MDI) */
+
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_MDI_ARCHITECTURE must be defined."
@@ -1340,6 +1348,15 @@
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #if wxUSE_MDI_ARCHITECTURE
+#   if !wxUSE_MDI
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "MDI requires wxUSE_MDI"
+#        else
+#            undef wxUSE_MDI
+#            define wxUSE_MDI 1
+#        endif
+#   endif
+
 #   if !wxUSE_DOC_VIEW_ARCHITECTURE
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"

include/wx/mac/setup0.h

@@ -739,10 +739,21 @@
 // Big GUI components
 // ----------------------------------------------------------------------------
 
+// Set to 0 to disable MDI support.
+//
+// Requires wxUSE_NOTEBOOK under platforms other than MSW.
+//
+// Default is 1.
+//
+// Recommended setting: 1, can be safely set to 0.
+#define wxUSE_MDI 1
+
 // Set to 0 to disable document/view architecture
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 
 // Set to 0 to disable MDI document/view architecture
+//
+// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
 #define wxUSE_MDI_ARCHITECTURE    1
 
 // Set to 0 to disable print/preview architecture code

include/wx/mdi.h

@@ -3,7 +3,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/mdig.h"
@@ -21,7 +21,7 @@
     #include "wx/generic/mdig.h"
 #endif
 
-#endif // wxUSE_MDI_ARCHITECTURE
+#endif // wxUSE_MDI
 
 #endif
     // _WX_MDI_H_BASE_

include/wx/msw/setup0.h

@@ -786,10 +786,21 @@
 // Big GUI components
 // ----------------------------------------------------------------------------
 
+// Set to 0 to disable MDI support.
+//
+// Requires wxUSE_NOTEBOOK under platforms other than MSW.
+//
+// Default is 1.
+//
+// Recommended setting: 1, can be safely set to 0.
+#define wxUSE_MDI 1
+
 // Set to 0 to disable document/view architecture
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 
 // Set to 0 to disable MDI document/view architecture
+//
+// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
 #define wxUSE_MDI_ARCHITECTURE    1
 
 // Set to 0 to disable print/preview architecture code

include/wx/os2/setup0.h

@@ -156,6 +156,8 @@
 
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
                                   // Set to 0 to disable document/view architecture
+#define wxUSE_MDI 1
+
 #define wxUSE_MDI_ARCHITECTURE  1
                                   // Set to 0 to disable MDI document/view architecture
 #define wxUSE_PRINTING_ARCHITECTURE  1

src/gtk/mdi.cpp

@@ -16,7 +16,7 @@
 
 #include "wx/mdi.h"
 
-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI
 
 #include "wx/dialog.h"
 #include "wx/menu.h"

src/gtk1/mdi.cpp

@@ -16,7 +16,7 @@
 
 #include "wx/mdi.h"
 
-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI
 
 #include "wx/dialog.h"
 #include "wx/menu.h"

src/msw/mdi.cpp

@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+#if wxUSE_MDI && !defined(__WXUNIVERSAL__)
 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
@@ -1394,6 +1394,5 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
     *hwndDeact = (WXHWND)wParam;
 }
 
-#endif
-// wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)