Batch of several fixes:

    - fix #2328 and #2350: regressions in WPopupMenu / WMenuItem
    - fix for JWt suggestionpopup backwards compatibility
    - fixed #2282: memory leak in WTableView/WTreeView
    - propagate the WMouseEvent to WAbstractItemView headerClicked events

Author: Koen Deforche

src/Wt/WAbstractItemView

@@ -769,15 +769,15 @@ public:
    *
    * \sa clicked(), headerDblClicked()
    */
-  Signal<int> &headerClicked() { return headerClicked_; }
+  Signal<int, WMouseEvent> &headerClicked() { return headerClicked_; }
 
   /*! \brief %Signal emitted when a header item is double clicked.
    *
    * The argument that is passed is the column number.
    *
    * \sa doubleClicked(), headerClicked()
    */
-  Signal<int> &headerDoubleClicked() { return headerDblClicked_; }
+  Signal<int, WMouseEvent> &headerDoubleClicked() { return headerDblClicked_; }
 
   /*! \brief Configures the number of columns that are used as row
    *         headers.
@@ -1037,17 +1037,17 @@ private:
 
   WSignalMapper<int> *clickedForExpandMapper_, *clickedForCollapseMapper_;
 
-  WSignalMapper<int> *headerDblClickedMapper_,
-   *headerClickedMapper_;
+//  WSignalMapper<int, WMouseEvent> *headerDblClickedMapper_,
+//    *headerClickedMapper_;
   bool alternatingRowColors_;
 
   JSlot resizeHandleMDownJS_;
 
   typedef std::map<WModelIndex, Editor> EditorMap;
   EditorMap editedItems_;
 
-  Signal<int> headerDblClicked_;
-  Signal<int> headerClicked_;
+  Signal<int, WMouseEvent> headerDblClicked_;
+  Signal<int, WMouseEvent> headerClicked_;
 
   Signal<WModelIndex, WMouseEvent> clicked_;
   Signal<WModelIndex, WMouseEvent> doubleClicked_;
@@ -1076,8 +1076,8 @@ private:
   void checkDragSelection();
   void configureModelDragDrop();
 
-  void handleHeaderClicked(int columnid);
-  void handleHeaderDblClicked(int columnid);
+  void handleHeaderClicked(int columnid, WMouseEvent event);
+  void handleHeaderDblClicked(int columnid, WMouseEvent event);
   void toggleSortColumn(int columnid);
   void updateColumnWidth(int columnId, int width);
 

src/Wt/WAbstractItemView.C

@@ -252,13 +252,6 @@ WAbstractItemView::WAbstractItemView(WContainerWidget *parent)
 
   typedef WAbstractItemView Self;
 
-  headerClickedMapper_ = new WSignalMapper<int>(this);
-  headerClickedMapper_->mapped().connect(this, &Self::handleHeaderClicked);
-
-  headerDblClickedMapper_ = new WSignalMapper<int>(this);
-  headerDblClickedMapper_->mapped().connect(this,
-                                            &Self::handleHeaderDblClicked);
-
   clickedForCollapseMapper_ = new WSignalMapper<int>(this);
   clickedForCollapseMapper_->mapped().connect(this, &Self::collapseColumn);
 
@@ -293,11 +286,13 @@ WAbstractItemView::~WAbstractItemView()
 
 void WAbstractItemView::setModel(WAbstractItemModel *model)
 {
+  bool isReset = false;
   if (model_) {
     /* disconnect slots from previous model */
     for (unsigned i = 0; i < modelConnections_.size(); ++i)
       modelConnections_[i].disconnect();
     modelConnections_.clear();
+    isReset = true;
   }
 
   model_ = model;
@@ -312,6 +307,9 @@ void WAbstractItemView::setModel(WAbstractItemModel *model)
 
   editedItems_.clear();
 
+  if (!isReset)
+    initDragDrop();
+
   configureModelDragDrop();
 
   setRootIndex(WModelIndex());
@@ -607,8 +605,6 @@ void WAbstractItemView::dropEvent(const WDropEvent& e, const WModelIndex& index)
 
 void WAbstractItemView::configureModelDragDrop()
 {
-  initDragDrop();
-
   if (!model_)
     return;
 
@@ -675,20 +671,20 @@ WWidget *WAbstractItemView::extraHeaderWidget(int column)
   return columnInfo(column).extraHeaderWidget;
 }
 
-void WAbstractItemView::handleHeaderClicked(int columnid)
+void WAbstractItemView::handleHeaderClicked(int columnid, WMouseEvent event)
 {
   int column = columnById(columnid);
   ColumnInfo& info = columnInfo(column);
 
   if (sortEnabled_ && info.sorting)
     toggleSortColumn(columnid);
 
-  headerClicked_.emit(column);
+  headerClicked_.emit(column, event);
 }
 
-void WAbstractItemView::handleHeaderDblClicked(int columnid)
+void WAbstractItemView::handleHeaderDblClicked(int columnid, WMouseEvent event)
 {
-  headerDblClicked_.emit(columnById(columnid));
+  headerDblClicked_.emit(columnById(columnid), event);
 }
 
 void WAbstractItemView::toggleSortColumn(int columnid)
@@ -1011,8 +1007,9 @@ WWidget *WAbstractItemView::createHeaderWidget(int column)
     sortIcon->setObjectName("sort");
     sortIcon->setInline(false);
     sortIcon->setStyleClass("Wt-tv-sh Wt-tv-sh-none");
-    headerClickedMapper_->mapConnect(sortIcon->clicked(), info.id);
-
+    sortIcon->clicked().connect(
+          boost::bind(&WAbstractItemView::handleHeaderClicked,
+                      this, info.id, _1));
     if (currentSortColumn_ == column)
       sortIcon->setStyleClass(info.sortOrder == AscendingOrder
 			      ? "Wt-tv-sh Wt-tv-sh-up"
@@ -1043,8 +1040,12 @@ WWidget *WAbstractItemView::createHeaderWidget(int column)
   // FIXME: we probably want this as an API option ?
   WInteractWidget *ww = dynamic_cast<WInteractWidget *>(i);
   if (ww){
-    headerClickedMapper_->mapConnect(ww->clicked(), info.id);
-    headerDblClickedMapper_->mapConnect(ww->doubleClicked(), info.id);
+    ww->clicked().connect(
+          boost::bind(&WAbstractItemView::handleHeaderClicked, this,
+                      info.id, _1));
+    ww->doubleClicked().connect(
+          boost::bind(&WAbstractItemView::handleHeaderDblClicked,
+                      this, info.id, _1));
   }
 
   int headerLevel = model_ ? this->headerLevel(column) : 0;

src/Wt/WInteractWidget

@@ -330,6 +330,7 @@ public:
    */
   int mouseOverDelay() const;
 
+  virtual void setPopup(bool popup);
   virtual void load();
   virtual bool isEnabled() const;
 

src/Wt/WInteractWidget.C

@@ -55,6 +55,17 @@ WInteractWidget::~WInteractWidget()
   delete dragSlot_;
 }
 
+void WInteractWidget::setPopup(bool popup)
+{
+  if (popup) {
+    clicked().preventPropagation();
+    mouseWentDown().preventPropagation();
+    mouseWentUp().preventPropagation();
+  }
+
+  WWebWidget::setPopup(popup);
+}
+
 EventSignal<WKeyEvent>& WInteractWidget::keyWentDown()
 {
   return *keyEventSignal(KEYDOWN_SIGNAL, true);

src/Wt/WMenuItem.C

@@ -85,7 +85,6 @@ void WMenuItem::create(const std::string& iconPath, const WString& text,
 
   if (!separator_) {
     WAnchor *anchor = new WAnchor(this);
-    anchor->clicked().preventPropagation();
     updateInternalPath();
   }
 
@@ -421,6 +420,7 @@ void WMenuItem::connectSignals()
 void WMenuItem::setParentMenu(WMenu *menu)
 {
   menu_ = menu;
+
   updateInternalPath();
 }
 

src/Wt/WSuggestionPopup

@@ -187,6 +187,10 @@ public:
    * \sa WSuggestionPopup
    */
   struct Options {
+    /*! \brief Constructor
+     */
+    Options();
+
     /*! \brief Open tag to highlight a match in a suggestion.
      *
      * Must be an opening markup tag, such as <b>.

src/Wt/WSuggestionPopup.C

@@ -51,6 +51,10 @@ namespace Wt {
 
 LOGGER("WSuggestionPopup");
 
+WSuggestionPopup::Options::Options() 
+  : listSeparator(0)
+{ }
+
 WSuggestionPopup::WSuggestionPopup(const Options& options, WObject *parent)
   : WPopupWidget(new WContainerWidget(), parent),
     model_(0),

src/Wt/WTableView.C

@@ -1242,6 +1242,8 @@ void WTableView::modelColumnsAboutToBeRemoved(const WModelIndex& parent,
     if (!columnInfo(i).hidden)
       width += (int)columnInfo(i).width.toPixels() + 7;
 
+  for (int i=start; i<start+count; i++)
+    delete columns_[i].styleRule;
   columns_.erase(columns_.begin() + start, columns_.begin() + start + count);
 
   if (ajaxMode())

src/Wt/WTreeView.C

@@ -1833,6 +1833,8 @@ void WTreeView::modelColumnsAboutToBeRemoved(const WModelIndex& parent,
 	doJavaScript("$('#" + id() + "').data('obj').adjustColumns();");
     }
 
+    for (int i=start; i<start+count; i++)
+      delete columns_[i].styleRule;
     columns_.erase(columns_.begin() + start, columns_.begin() + start + count);
 
     if (renderState_ < NeedRerenderHeader) {

src/Wt/WWebWidget

@@ -318,15 +318,16 @@ private:
   static const int BIT_DISABLED = 24;
   static const int BIT_DISABLED_CHANGED = 25;
   static const int BIT_CONTAINS_LAYOUT = 26;
+  static const int BIT_ZINDEX_CHANGED = 27;
 
 #ifndef WT_TARGET_JAVA
-  static const std::bitset<27> AllChangeFlags;
+  static const std::bitset<28> AllChangeFlags;
 #endif // WT_TARGET_JAVA
 
   /*
    * Frequently used attributes.
    */
-  std::bitset<27> flags_;
+  std::bitset<28> flags_;
   WLength *width_;
   WLength *height_;