Several changes:

    - Fixed bug with input mask when value assigned before render
    - Fixed WCssStyleSheet bugs (#3229)
    - Implemented client's screen resolution to WEnvironment (#3215)

Author: Koen Deforche

examples/widgetgallery/approot/src.xml

@@ -19,61 +19,62 @@
  */
 class ComboDelegate : public Wt::WItemDelegate {
 public:
-  ComboDelegate(Wt::WStringListModel* items)
-    : items_(items)
-  {}
-
-  void setModelData(const boost::any &editState, Wt::WAbstractItemModel* model,
-		    const Wt::WModelIndex &index) const
-  {
-    int stringIdx = Wt::asNumber(editState);
-    model->setData(index, stringIdx, Wt::UserRole);
-    model->setData(index, items_->stringList()[stringIdx], Wt::DisplayRole);
-  }
-
-  boost::any editState(Wt::WWidget* editor) const
-  {
-    Wt::WComboBox* combo = dynamic_cast<Wt::WComboBox*>
-      (dynamic_cast<Wt::WContainerWidget*>(editor)->widget(0));
-    return combo->currentIndex();
-  }
-
-  void setEditState(Wt::WWidget* editor, const boost::any &value) const
-  {
-    Wt::WComboBox* combo = dynamic_cast<Wt::WComboBox*>
-      (dynamic_cast<Wt::WContainerWidget*>(editor)->widget(0));
-    combo->setCurrentIndex(Wt::asNumber(value));
-  }
+    ComboDelegate(Wt::WAbstractItemModel* items)
+	: items_(items)
+    { }
+
+    void setModelData(const boost::any &editState, Wt::WAbstractItemModel* model,
+		      const Wt::WModelIndex &index) const
+    {
+	int stringIdx = Wt::asNumber(editState);
+	model->setData(index, stringIdx, Wt::UserRole);
+	model->setData(index, items_->data(stringIdx, 0), Wt::DisplayRole);
+    }
+
+    boost::any editState(Wt::WWidget* editor) const
+    {
+	Wt::WComboBox* combo = dynamic_cast<Wt::WComboBox*>
+	    (dynamic_cast<Wt::WContainerWidget*>(editor)->widget(0));
+	return combo->currentIndex();
+    }
+
+    void setEditState(Wt::WWidget* editor, const boost::any &value) const
+    {
+	Wt::WComboBox* combo = dynamic_cast<Wt::WComboBox*>
+	    (dynamic_cast<Wt::WContainerWidget*>(editor)->widget(0));
+	combo->setCurrentIndex(Wt::asNumber(value));
+    }
 
 protected:
-  virtual Wt::WWidget* createEditor(const Wt::WModelIndex &index,
-				    Wt::WFlags<Wt::ViewItemRenderFlag> flags) const
-  {
-    Wt::WContainerWidget* container = new Wt::WContainerWidget();
-    Wt::WComboBox* combo = new Wt::WComboBox(container);
-    combo->setModel(items_);
-    combo->setCurrentIndex(Wt::asNumber(index.data(Wt::UserRole)));
-
-    combo->changed().connect(boost::bind(&ComboDelegate::doCloseEditor, this,
-    					 container, true));
-    combo->enterPressed().connect(boost::bind(&ComboDelegate::doCloseEditor,
+    virtual Wt::WWidget* createEditor(const Wt::WModelIndex &index,
+				      Wt::WFlags<Wt::ViewItemRenderFlag> flags) const
+    {
+	Wt::WContainerWidget* container = new Wt::WContainerWidget();
+	Wt::WComboBox* combo = new Wt::WComboBox(container);
+	combo->setModel(items_);
+	combo->setCurrentIndex(Wt::asNumber(index.data(Wt::UserRole)));
+
+	combo->changed().connect(boost::bind(&ComboDelegate::doCloseEditor, this,
+					     container, true));
+	combo->enterPressed().connect(boost::bind(&ComboDelegate::doCloseEditor,
     					      this, container, true));
-    combo->escapePressed().connect(boost::bind(&ComboDelegate::doCloseEditor,
-    					      this, container, false));
+	combo->escapePressed().connect(boost::bind(&ComboDelegate::doCloseEditor,
+						   this, container, false));
 
-    return container;
-  }
+	return container;
+    }
 
 private:
-  Wt::WStringListModel* items_;
+    Wt::WAbstractItemModel* items_;
 
-  void doCloseEditor(Wt::WWidget *editor, bool save) const
-  {
-    closeEditor().emit(editor, save);
-  }
+    void doCloseEditor(Wt::WWidget *editor, bool save) const
+    {
+	closeEditor().emit(editor, save);
+    }
 };
 
 SAMPLE_BEGIN(ComboDelegateTable)
+
 Wt::WTableView *table = new Wt::WTableView();
 
 // create model

examples/widgetgallery/examples/ComboDelegateTable.cpp

@@ -366,6 +366,7 @@ public:
    * External stylesheets are inserted after the internal style sheet,
    * and can therefore override default styles set by widgets in the
    * internal style sheet.
+   * External stylesheets must have valid link.
    *
    * If not empty, \p condition is a string that is used to apply the
    * stylesheet to specific versions of IE. Only a limited subset of

src/Wt/WApplication

@@ -553,6 +553,11 @@ void WApplication::useStyleSheet(const WLink& link,
 void WApplication::useStyleSheet(const WCssStyleSheet& styleSheet,
 				 const std::string& condition)
 {
+
+  if (styleSheet.link().isNull())
+    throw WException(
+        "WApplication::useStyleSheet stylesheet must have valid link!");
+
   bool display = true;
 
   if (!condition.empty()) {

src/Wt/WApplication.C

@@ -244,6 +244,7 @@ public:
    *
    * Optionally, you may give a \p ruleName, which may later be
    * used to check if the rule was already defined.
+   * Note: you may not pass the same rule to 2 diffrent applications.
    *
    * \sa isDefined()
    */
@@ -284,6 +285,10 @@ private:
   std::vector<std::string> rulesRemoved_;
 
   std::set<std::string> defined_;
+
+  bool isDirty();
+
+  friend class WebRenderer;
 };
 
 }

src/Wt/WCssStyleSheet

@@ -335,4 +335,10 @@ void WCssStyleSheet::clear()
     delete rules_.back();
 }
 
+bool WCssStyleSheet::isDirty()
+{
+  return !rulesAdded_.empty() || !rulesModified_.empty() ||
+      !rulesRemoved_.empty();
+}
+
 } // namespace Wt

src/Wt/WCssStyleSheet.C

@@ -254,6 +254,18 @@ public:
 
   bool webGL() const { return webGLsupported_; }
 
+  /*! \brief Returns the horizontal resolution of the client's screen.
+   *
+   * \sa screenHeight()
+   */
+  int screenWidth() const { return screenWidth_; }
+
+  /*! \brief Returns the vertical resolution of the client's screen.
+   *
+   * \sa screenWidth()
+   */
+  int screenHeight() const { return screenHeight_; }
+
   /*! \brief Returns the browser-side DPI scaling factor
    *
    * Internet Explorer scales all graphics, fonts and other elements
@@ -651,6 +663,8 @@ protected:
   bool        doesCookies_;
   bool        hashInternalPaths_;
   UserAgent   agent_;
+  int         screenWidth_;
+  int         screenHeight_;
   double      dpiScale_;
   std::string queryString_;
   bool        webGLsupported_;

src/Wt/WEnvironment

@@ -231,6 +231,10 @@ void WEnvironment::enableAjax(const WebRequest& request)
     if (s != 0)
       publicDeploymentPath_.clear(); // looks invalid
   }
+
+
+  screenWidth_=boost::lexical_cast<int>(*request.getParameter("scrW"));
+  screenHeight_=boost::lexical_cast<int>(*request.getParameter("scrH"));
 }
 
 void WEnvironment::setUserAgent(const std::string& userAgent)

src/Wt/WEnvironment.C

@@ -291,6 +291,18 @@ namespace Wt {
     class Message;
   }
 
+  namespace Payment {
+    class Address;
+    class Customer;
+    class Money;
+    class Order;
+    class OrderItem;
+    class PayPalExpressCheckout;
+    class PayPalService;
+    class Result;
+    class Approval;
+  }
+
   namespace Render {
     class WPdfRenderer;
   }

src/Wt/WGlobal

@@ -96,11 +96,12 @@ WT_DECLARE_WT_MEMBER
       caseMap = newCaseMap;
       spaceChar = newSpaceChar;
       displayValue = newDisplayValue;
+      this.setValue(displayValue);
+      edit.value = this.getValue();
     };
 
     if (mask !== "") {
       this.setInputMask(mask, raw, displayValue, caseMap, spaceChar);
-      this.setValue(this.getValue());
     }
 
     function skippable(position) {