A batch of fixes and small improvements:

    fix layout regression causing WDialog::show() not to work properly

    WPanel: also take into account maximum panel height

    remove the xhtml mime-type option, viva HTML5

    be robust when modal dialogs are not being created and destroyed as a stack (#1512, #2005)

Author: Koen Deforche

src/Wt/Test/WTestEnvironment

@@ -239,11 +239,9 @@ public:
    */
   void setInternalPath(const std::string& internalPath);
 
-  /*! \brief Sets the content type.
+  /*! \brief Sets the content type (<b>deprecated</b>.
    *
-   * The default value is XHTML1.
-   *
-   * \sa contentType()
+   * Since contentType is now always HTML5, this setting is ignored.
    */
   void setContentType(ContentType contentType);
 

src/Wt/Test/WTestEnvironment.C

@@ -100,7 +100,6 @@ void WTestEnvironment::init(EntryPointType type)
   doesAjax_ = true;
   doesCookies_ = true;
   dpiScale_ = 1;
-  contentType_ = XHTML1;
 
   urlScheme_ = "http";
   referer_ = "";
@@ -224,9 +223,7 @@ void WTestEnvironment::setInternalPath(const std::string& internalPath)
 }
 
 void WTestEnvironment::setContentType(ContentType contentType)
-{
-  contentType_ = contentType;
-}
+{ }
 
 void WTestEnvironment::setUserAgent(const std::string& userAgent)
 {

src/Wt/WApplication

@@ -2152,11 +2152,10 @@ private:
 #endif // WT_TARGET_JAVA
   std::string            javaScriptClass_;
   AjaxMethod             ajaxMethod_;
-  WContainerWidget      *dialogCover_;
   bool                   quited_;
   std::string            onePixelGifUrl_;
   bool                   internalPathsEnabled_;
-  std::vector<WWidget *> exposedOnly_;
+  WWidget               *exposedOnly_;
   WLoadingIndicator     *loadingIndicator_;
   WWidget               *loadingIndicatorWidget_;
   bool                   connected_;
@@ -2208,9 +2207,7 @@ private:
   std::map<const char *, boost::any> objectStore_;
 
   WContainerWidget *timerRoot() const { return timerRoot_; }
-  WContainerWidget *dialogCover(bool create = true);
-
-  WEnvironment&     env();       // short-hand for session_->env()
+  WEnvironment& env(); // short-hand for session_->env()
 
   /*
    * Functions for exposed signals, resources, and objects

src/Wt/WApplication.C

@@ -96,9 +96,9 @@ WApplication::WApplication(const WEnvironment& env
     eventSignalPool_(new boost::pool<>(sizeof(EventSignal<>))),
 #endif // WT_CNOR
     javaScriptClass_("Wt"),
-    dialogCover_(0),
     quited_(false),
     internalPathsEnabled_(false),
+    exposedOnly_(0),
     loadingIndicator_(0),
     connected_(true),
     bodyHtmlClassChanged_(true),
@@ -370,7 +370,6 @@ std::string WApplication::onePixelGifUrl()
 WApplication::~WApplication()
 {
   timerRoot_ = 0; // marker for being deleted
-  dialogCover_ = 0;
 
   delete domRoot_;
   domRoot_ = 0;
@@ -471,32 +470,15 @@ void WApplication::bindWidget(WWidget *widget, const std::string& domId)
   domRoot2_->addWidget(widget);
 }
 
-WContainerWidget *WApplication::dialogCover(bool create)
-{
-  if (dialogCover_ == 0 && create && timerRoot_) {
-    dialogCover_ = new WContainerWidget(domRoot_);    
-    theme()->apply(domRoot_, dialogCover_, DialogCoverRole);
-    dialogCover_->hide();
-  }
-
-  return dialogCover_;
-}
-
 void WApplication::pushExposedConstraint(WWidget *w)
 {
-  exposedOnly_.push_back(w);
+  exposedOnly_ = w;
 }
 
 void WApplication::popExposedConstraint(WWidget *w)
 {
-  for (unsigned i = exposedOnly_.size(); i > 0; --i) {
-    unsigned j = i - 1;
-    if (exposedOnly_[j] == w) {
-      while (exposedOnly_.size() > j)
-	exposedOnly_.pop_back();
-      break;
-    }
-  }
+  assert (exposedOnly_ == w);
+  exposedOnly_ = 0;
 }
 
 void WApplication::addGlobalWidget(WWidget *w)
@@ -523,20 +505,9 @@ bool WApplication::isExposed(WWidget *w) const
   if (w->parent() == timerRoot_)
     return true;
 
-  if (!exposedOnly_.empty()) {
-    WWidget *top = exposedOnly_.back();
-
-    if (top->isExposed(w))
-      return true;
-
-    for (WWidget *p = w->parent(); p; p = p->parent()) {
-      if (p == domRoot_)
-	return w != root();
-      w = p;
-    }
-
-    return false;
-  } else {
+  if (exposedOnly_)
+    return exposedOnly_->isExposed(w);
+  else {
     WWidget *p = w->adam();
     return (p == domRoot_ || p == domRoot2_);
   }

src/Wt/WCompositeWidget

@@ -129,6 +129,7 @@ public:
   virtual bool loaded() const;
   virtual void setTabIndex(int index);
   virtual int tabIndex() const;
+  virtual int zIndex() const;
   virtual void setId(const std::string& id);
   virtual WWidget *find(const std::string& name);
   virtual WWidget *findById(const std::string& name);

src/Wt/WCompositeWidget.C

@@ -436,6 +436,11 @@ int WCompositeWidget::tabIndex() const
   return impl_->tabIndex();
 }
 
+int WCompositeWidget::zIndex() const
+{
+  return impl_->zIndex();
+}
+
 void WCompositeWidget::setImplementation(WWidget *widget)
 {
   if (widget->parent())

src/Wt/WContainerWidget.C

@@ -108,6 +108,7 @@ void WContainerWidget::setLayout(WLayout *layout,
     flags_.set(BIT_LAYOUT_NEEDS_RERENDER);
 
     if (layout) {
+      containsLayout();
       WWidget::setLayout(layout);
       layoutImpl()->setContainer(this);
     }

src/Wt/WDialog

@@ -13,9 +13,7 @@
 
 namespace Wt {
 
-class WTable;
-class WTemplate;
-class WText;
+class DialogCover;
 
 /*! \class WDialog Wt/WDialog Wt/WDialog
  *  \brief A %WDialog shows a dialog.
@@ -57,7 +55,6 @@ class WText;
  * some intranets or extranets).  \if java This functionality is only
  * available on Servlet 3.0 compatible servlet containers.  \endif
  *
- *
  * Use \link setModal() setModal(false)\endlink  to create a non-modal
  * dialog. A non-modal dialog does not block the underlying user interface:
  * the user must not first deal with the dialog before interacting with the
@@ -354,9 +351,6 @@ private:
   mutable WContainerWidget *footer_;
   bool              modal_, resizable_;
 
-  int               coverPreviousZIndex_;
-  bool              coverWasHidden_;
-
   Signal<DialogCode> finished_;
 
   DialogCode result_;
@@ -369,8 +363,8 @@ private:
   Wt::Signals::connection escapeConnection2_;
 
   void create();
-  void saveCoverState(WApplication *app, WContainerWidget *cover);
-  void restoreCoverState(WApplication *app, WContainerWidget *cover);
+
+  DialogCover *cover();
 };
 
 }