Several updates:

    - allow HTML5 history to process state-pop's from a previous session
    - support XHTML tooltips in item models
    - memory fixes for WMenuItem. This code crashed on session destruction:
    - fix drag/drop regression initiated on an inline element

Author: Koen Deforche

src/Wt/WItemDelegate.C

@@ -140,7 +140,9 @@ WWidget *WItemDelegate::update(WWidget *widget, const WModelIndex& index,
 
   WString tooltip = asString(index.data(ToolTipRole));
   if (!tooltip.empty() || !isNew)
-    widgetRef.w->setToolTip(tooltip);
+    widgetRef.w->setToolTip(tooltip,
+			    (index.flags() & ItemIsXHTMLText) ? 
+			    XHTMLText : PlainText);
 
   WT_USTRING sc = asString(index.data(StyleClassRole));
 

src/Wt/WMenuItem

@@ -299,6 +299,7 @@ public:
    * this item.
    */
   WWidget *contents() const;
+
   WWidget *takeContents();
 
   /*! \brief Returns the widget that represents the item (<b>deprecated</b>).
@@ -371,6 +372,7 @@ private:
   bool separator_, selectable_, signalsConnected_;
 
   Signal<WMenuItem *> triggered_;
+  Wt::Signals::connection contentsDestroyedConnection_;
 
   std::string pathComponent_;
   bool customPathComponent_, internalPathEnabled_;
@@ -390,6 +392,7 @@ private:
   void connectClose();
   void connectSignals();
   void setItemPadding(bool padding);
+  void contentsDestroyed();
 
   friend class WMenu;
   friend class WPopupMenu;

src/Wt/WMenuItem.C

@@ -62,6 +62,15 @@ void WMenuItem::create(const std::string& iconPath, const WString& text,
 {
   contentsContainer_ = 0;
   contents_ = contents;
+
+#ifndef WT_CNOR
+  // contents' ownership will be moved to a containerwidget once
+  // it is in the widget tree (contentsLoaded). In any case, if
+  // contents_ is destroyed elsewhere, we want to know about it.
+  contentsDestroyedConnection_ =
+    contents_->destroyed().connect(this, &WMenuItem::contentsDestroyed);
+#endif // WT_CNOR
+
   menu_ = 0;
   customPathComponent_ = false;
   internalPathEnabled_ = true;
@@ -378,6 +387,8 @@ bool WMenuItem::contentsLoaded() const
 
 void WMenuItem::loadContents()
 {
+  if (!contents_)
+    return;
   if (!contentsLoaded()) {
     contentsContainer_->addWidget(contents_);
     signalsConnected_ = false;
@@ -434,20 +445,34 @@ WWidget *WMenuItem::contents() const
 
 WWidget *WMenuItem::takeContents()
 {
+  if (contents_ == 0)
+    return 0;
+
   WWidget *result = contents_;
 
-  if (contentsLoaded())
+  if (contentsLoaded()) {
     if (contentsContainer_)
       contentsContainer_->removeWidget(contents_);
+  } else {
+    // contents_ is still owned by WMenuItem -> setting ptr to 0 is ok
+  }
 
+  if (contentsDestroyedConnection_.connected())
+    contentsDestroyedConnection_.disconnect();
   contents_ = 0;
 
   return result;
 }
 
 void WMenuItem::purgeContents()
 {
+  // this is called to avoid dangling pointers to objects that are deleted
   contentsContainer_ = 0;
+  // two cases are possible for contents: either ownership is with WMenuItem,
+  // or it was with the destroyed container. In the first case, we have to
+  // delete, while in the second case, contents_ will already be deleted and
+  // set to 0 by the contentsDestroyed() slot
+  delete contents_;
   contents_ = 0;
 }
 
@@ -515,4 +540,10 @@ void WMenuItem::setItemPadding(bool padding)
   }
 }
 
+void WMenuItem::contentsDestroyed()
+{
+  contentsContainer_ = 0;
+  contents_ = 0;
+}
+
 }

src/Wt/WModelIndex

@@ -113,16 +113,19 @@ typedef std::treeset<WModelIndex> WModelIndexSet;
  * \ingroup modelview
  */
 enum ItemDataRole {
-  DisplayRole = 0,      //!< Role for textual representation
-  DecorationRole = 1,   //!< Role for the url of an icon
-  EditRole = 2,         //!< Role for the edited value
-  StyleClassRole = 3,   //!< Role for the style class
-  /*! Role that indicates the check state. Data for this role should be
-   * a <tt>bool</tt>. When the Wt::ItemIsTristate flag is set for the item,
-   * data for this role should be of type Wt::CheckState.
+  DisplayRole = 0,       //!< Role for textual representation
+  DecorationRole = 1,    //!< Role for the url of an icon
+  EditRole = 2,          //!< Role for the edited value
+  StyleClassRole = 3,    //!< Role for the style class
+
+  /*! Role that indicates the check state.
+   *
+   * Data for this role should be a <tt>bool</tt>. When the
+   * Wt::ItemIsTristate flag is set for the item, data for this role
+   * should be of type Wt::CheckState.
    */
   CheckStateRole = 4,   
-  ToolTipRole = 5,       //!< Role for a tooltip
+  ToolTipRole = 5,       //!< Role for a (plain) tooltip
   LinkRole = 6,          //!< Role for a link
   MimeTypeRole = 7,      //!< Role for mime type information
   LevelRole = 8,         //!< Level in aggregation, for header data.
@@ -148,11 +151,13 @@ enum ItemFlag {
   ItemIsUserCheckable = 0x4, //!< Item can be checked (checkbox is enabled)
   ItemIsDragEnabled = 0x8,   //!< Item can be dragged
   ItemIsDropEnabled = 0x10,  //!< Item can be a drop target
-  /*! Item has tree states. When set, Wt::CheckStateRole data is of type
+  /*! Item has tree states.
+   *
+   * When set, Wt::CheckStateRole data is of type
    * Wt::CheckState
    */
   ItemIsTristate = 0x20,
-  ItemIsXHTMLText = 0x40,    //!< Item's textual is HTML
+  ItemIsXHTMLText = 0x40,    //!< Item's text (DisplayRole, ToolTipRole) is HTML
   ItemIsDirty = 0x80         //!< Item's value has been modified
 };
 

src/Wt/WStandardItem.C

@@ -370,7 +370,7 @@ void WStandardItem::setEditable(bool editable)
     signalModelDataChange();
   }
   else if (isEditable() && !editable) {
-    flags_ ^= ItemIsEditable;
+    flags_.clear(ItemIsEditable);
     signalModelDataChange();
   }
 }

src/Wt/WTableView.C

@@ -166,8 +166,10 @@ WTableView::WTableView(WContainerWidget *parent)
        "if (obj) obj.autoJavaScript();}");
 
     connectObjJS(canvas_->mouseWentDown(), "mouseDown");
-    connectObjJS(contentsContainer_->scrolled(),
-                 "onContentsContainerScroll");
+
+    /* Two-lines needed for WT_PORT */
+    EventSignalBase& ccScrolled = contentsContainer_->scrolled();
+    connectObjJS(ccScrolled, "onContentsContainerScroll");
   } else {
     plainTable_ = new WTable();
     plainTable_->setStyleClass("Wt-plaintable");

src/js/WTableView.min.js

@@ -1620,8 +1620,14 @@ if (html5History) {
 	  newState = stateMap[w.location.pathname + w.location.search];
 
 	if (newState == null) {
-	  saveState(currentState);
-	  return;
+	  var endw = w.location.pathname.lastIndexOf(currentState);
+	  if (endw != -1 &&
+	      endw == w.location.pathname.length - currentState.length) {
+	    saveState(currentState);
+	    return;
+	  } else {
+	    newState = w.location.pathname.substr(baseUrl.length);
+	  }
 	}
 
 	if (newState != currentState) {
@@ -2044,8 +2050,9 @@ function dragStart(obj, e) {
     /*
      * Ignore drags that start on a scrollbar (#1231)
      */
-    if (t.offsetWidth > t.clientWidth
-	|| t.offsetHeight > t.clientHeight) {
+    if (WT.css(t, 'display') !== 'inline' &&
+	(t.offsetWidth > t.clientWidth ||
+	 t.offsetHeight > t.clientHeight)) {
       var wc = WT.widgetPageCoordinates(t);
       var pc = WT.pageCoordinates(e);
       var x = pc.x - wc.x;