see Changelog

Author: Koen Deforche

.gitignore

@@ -4,3 +4,4 @@ doc/reference
 doc/examples
 CVS
 .DS_Store
+examples/*/resources

Changelog

@@ -1,12 +1,19 @@
-05-12-2010:
+11-01-2010:
+	* themes/polished: several improvements
+
+	* WPanel, WCalendar, WDatePicker, WDialog: improved theme support
+
+	* WTreeView: several bug fixes and improved IE bug workaround support
+
+05-01-2010:
 	* Chart/WAxis: added setLabelFont(), labelFont() methods
 
 	* WTreeNode: fix selection handling when removing and readding a node
 
 	* Boot.html, Hybrid.html: fix an XSS vulnerability arising from the
 	internal path
 
-04-12-2010:
+04-01-2010:
 	* Wt.js, CommAjax.js, CommScript.js: support communication problems
 	by retrying with exponential back-off
 

examples/blog/model/Post.C

@@ -31,8 +31,11 @@ std::string Post::commentCount() const
 
 dbo::ptr<Comment> Post::rootComment() const
 {
-  return comments.session()->find<Comment>
-    ("where post_id = ? and parent_id is null").bind(comments.arg());
+  if (session())
+    return session()->find<Comment>
+      ("where post_id = ? and parent_id is null").bind(id());
+  else
+    return dbo::ptr<Comment>();
 }
 
 std::string Post::titleToUrl() const

examples/blog/model/Post.h

@@ -22,7 +22,7 @@ namespace dbo = Wt::Dbo;
 typedef dbo::collection< dbo::ptr<Comment> > Comments;
 typedef dbo::collection< dbo::ptr<Tag> > Tags;
 
-class Post {
+class Post : public dbo::Dbo {
 public:
   enum State {
     Unpublished = 0,

examples/blog/model/User.C

@@ -65,20 +65,26 @@ bool User::authenticate(const std::string& password) const
 
 Posts User::latestPosts(int count) const
 {
-  return posts.session()->find<Post>
-    ("where author_id = ? and state = ? "
-     "order by date desc "
-     "limit ?")
-    .bind(posts.arg())
-    .bind(Post::Published)
-    .bind(count);
+  if (session())
+    return session()->find<Post>
+      ("where author_id = ? and state = ? "
+       "order by date desc "
+       "limit ?")
+      .bind(id())
+      .bind(Post::Published)
+      .bind(count);
+  else
+    return Posts();
 }
 
 Posts User::allPosts(Post::State state) const
 {
-  return posts.session()->find<Post>
-    ("where author_id = ? and state = ? "
-     "order by date desc")
-    .bind(posts.arg())
-    .bind(state);
+  if (session())
+    return session()->find<Post>
+      ("where author_id = ? and state = ? "
+       "order by date desc")
+      .bind(id())
+      .bind(state);
+  else
+    return Posts();
 }

examples/blog/model/User.h

@@ -18,7 +18,7 @@ namespace dbo = Wt::Dbo;
 typedef dbo::collection< dbo::ptr<Comment> > Comments;
 typedef dbo::collection< dbo::ptr<Post> > Posts;
 
-class User {
+class User : public dbo::Dbo {
 public:
   enum Role {
     Visitor = 0,

examples/treeview/TreeViewExample.C

@@ -4,9 +4,12 @@
  * See the LICENSE file for terms of use.
  */
 #include "TreeViewExample.h"
+
 #include <iostream>
 #include <boost/lexical_cast.hpp>
+
 #include <Wt/WContainerWidget>
+#include <Wt/WPanel>
 #include <Wt/WPushButton>
 #include <Wt/WStandardItem>
 #include <Wt/WStandardItemModel>
@@ -35,12 +38,13 @@ TreeViewExample::TreeViewExample(WStandardItemModel *model,
   /*
    * Now create the view
    */
-  treeView_ = new WTreeView(this);
+  WPanel *panel = new WPanel(this);
+  panel->resize(600, 300);
+  panel->setCentralWidget(treeView_ = new WTreeView());
   treeView_->setAlternatingRowColors(!treeView_->alternatingRowColors());
   treeView_->setRowHeight(30);
   treeView_->setModel(model_);
   treeView_->setSelectionMode(NoSelection);
-  treeView_->resize(600, 300);
 
   treeView_->setColumnWidth(1, WLength(100));
   treeView_->setColumnAlignment(1, AlignCenter);

examples/widgetgallery/FormWidgets.C

@@ -283,8 +283,10 @@ WWidget *FormWidgets::wInPlaceEdit()
   WContainerWidget *result = new WContainerWidget();
 
   topic("WInPlaceEdit", result);
-  new WText("<p>This widget allows you to edit a string by clicking "
-	    "on it. The text changes in a WLineEdit while editing.</p>",
+  new WText("<p>This widget allows you to edit a text in-place by clicking "
+	    "on it. You can enable the save/cancel buttons (like here below) "
+	    "or disable them (as used in the WCalendar widget to edit the "
+	    "year).</p>",
 	    result);
   new WText("Try it here: ", result);
   WInPlaceEdit *ipe = new WInPlaceEdit("This is editable text", result);
@@ -380,17 +382,17 @@ WWidget *FormWidgets::wPopupMenu()
   new WText(tr("formwidgets-WPopupMenu"), result);
 
   WPopupMenu *popup = new WPopupMenu();
-  popup->addItem("icons/popupmenu.gif", "String item with image");
-  popup->addItem("Checkable string item")->setCheckable(true);
-  popup->addItem("Plain string item");
+  popup->addItem("icons/house.png", "Build a house");
+  popup->addItem("Roof included")->setCheckable(true);
+  popup->addItem("Add a door");
   popup->addSeparator();
-  popup->addItem("Another plain string item");
+  popup->addItem("Add a window");
   WPopupMenu *subMenu = new WPopupMenu();
-  subMenu->addItem("Sub item");
-  popup->addMenu("Sub menu", subMenu);
+  subMenu->addItem("Add a chair");
+  subMenu->addItem("Add a table");
+  popup->addMenu("Add furniture", subMenu);
 
-  WLabel* clickMe = 
-    new WLabel("Click me and a WPopupMenu will appear!", result);
+  WLabel* clickMe = new WLabel("Clicking here will show a popup menu.", result);
   clickMe->setStyleClass("popupmenuLabel");
   clickMe->clicked().connect(SLOT(popup, WPopupMenu::popup));
 

examples/widgetgallery/MvcWidgets.C

@@ -8,17 +8,18 @@
 #include "TreeViewExample.h"
 #include "DeferredWidget.h"
 
+#include <Wt/WBreak>
 #include <Wt/WComboBox>
+#include <Wt/WPanel>
 #include <Wt/WPushButton>
 #include <Wt/WSelectionBox>
+#include <Wt/WStandardItem>
+#include <Wt/WStandardItemModel>
 #include <Wt/WStringListModel>
 #include <Wt/WText>
-#include <Wt/Ext/ComboBox>
 #include <Wt/WTreeView>
 #include <Wt/WTable>
-#include <Wt/WBreak>
-#include <Wt/WStandardItemModel>
-#include <Wt/WStandardItem>
+#include <Wt/Ext/ComboBox>
 #include <iostream>
 using namespace Wt;
 
@@ -60,11 +61,7 @@ void MvcWidgets::comboBoxAdd()
   if (extComboBox_->currentIndex() == -1) {
     std::vector<WString> sl = stringList_->stringList();
     sl.push_back(extComboBox_->currentText());
-    //std::cout << "combobox text: " << extComboBox_->currentText() << std::endl;
-    //sl.push_back("Blabla");
     stringList_->setStringList(sl);
-    //stringList_->insertRows(0, 1);
-    //stringList_->setData(0, 0, WString("Blabla"));
   }
 }
 
@@ -222,7 +219,6 @@ WWidget *MvcWidgets::viewsTree()
   result->addWidget(tv2);
 
   tv2->treeView()->setColumn1Fixed(true);
-  tv2->treeView()->resize(300, 150);
 
   return result;
 }

examples/widgetgallery/WidgetGallery.C

@@ -78,7 +78,6 @@ WidgetGallery::WidgetGallery(const WEnvironment& env)
   useStyleSheet("everywidget.css");
   useStyleSheet("dragdrop.css");
   useStyleSheet("combostyle.css");
-  useStyleSheet("popupmenu.css");
 }
 
 void WidgetGallery::addToMenu(WMenu *menu, const WString& name,