a batch of bug fixes, see Changelog

Author: Koen Deforche

Changelog

@@ -1,3 +1,18 @@
+13-09-2011
+	* WConfig: added a check to detect header/library version mismatches
+
+	* Chart/WAxis.C: a fix from Joe Garcia, crash with log scaling
+
+	* WItemDelegate: set target new window for WLink data when it references
+	a resource
+
+	* WMenu: fix hiding of a menu item to hide the entire item, not just
+	the contents (label)
+
+05-09-2011
+	* WResource, Http/ResponseContinuation: added API to suspend a response
+	while waiting for more data, and resuming later
+
 31-08-2011:
 	* WResource: use suggestedFilename() also when set during
 	handleRequest() (#920)

WConfig.h.in

@@ -13,16 +13,6 @@
 #define WT_VERSION (((WT_SERIES & 0xff) << 24) | ((WT_MAJOR & 0xff) << 16) | ((WT_MINOR & 0xff) << 8))
 #define WT_VERSION_STR "${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}"
 #define WT_CLASS       "Wt${VERSION_SERIES}_${VERSION_MAJOR}_${VERSION_MINOR}"
-#define WT_INCLUDED_VERSION Wt##WT_VERSION
-
-namespace Wt {
-  /*
-   * Symbols used to check that included version matches library version
-   * against which you link.
-   */
-  struct WtLibVersion { };
-  extern const WtLibVersion WT_INCLUDED_VERSION;
-}
 
 #define RUNDIR "${RUNDIR}"
 #define WT_CONFIG_XML "${CONFIGURATION}"

doc/main

@@ -186,7 +186,7 @@ namespace Wt {
    WRun() to start the %Wt application server. This method will return
    only when shutdown is signaled by the environment, and after the
    application server (and all remaining active sessions) has been
-   properly shutd down. One parameter to the WRun() function is a \em
+   properly shut down. One parameter to the WRun() function is a \em
    createApplication function object. Alternatively, if you wish to
    have more control over the application server, you may also
    instantiate and configure a WServer instance directly.
@@ -395,7 +395,7 @@ namespace Wt {
   These key values will be lookup up in so-called message resource
   bundles (see WMessageResourceBundle). These are a set of xml files
   that translate the keys to a localized string. The name of the xml
-  file determines the language contained therin (e.g. foo.xml, foo-nl.xml,
+  file determines the language contained therein (e.g. foo.xml, foo-nl.xml,
   foo-cn.xml)
 
   The strings that are used by classes within the %Wt library use the

doc/tutorial/wt/wt-sdj.odt

@@ -5,6 +5,7 @@
  */
 #include <Wt/WApplication>
 #include <Wt/WText>
+#include <Wt/WMessageBox>
 #include <Wt/WServer>
 
 #include <boost/thread.hpp>
@@ -131,7 +132,7 @@ void Server::run()
    * thread.
    */
   for (;;) {
-    boost::this_thread::sleep(boost::posix_time::seconds(1));
+    boost::this_thread::sleep(boost::posix_time::seconds(10));
 
     if (stop_)
       return;

examples/feature/broadcast/BroadCast.C

@@ -1,9 +1,12 @@
 WT_ADD_EXAMPLE(hangman.wt
   hangman.C
-  HangmanApplication.C
   User.C
+  Session.C
   HangmanGame.C
   HangmanWidget.C
+  WordWidget.C
+  LettersWidget.C
+  ImagesWidget.C
   HighScoresWidget.C
   LoginWidget.C
   Dictionary.C

examples/hangman/CMakeLists.txt

@@ -17,4 +17,4 @@ enum Dictionary {
 
 extern std::wstring RandomWord(Dictionary dictionary);
 
-#endif
+#endif //DICTIONARY_H_

examples/hangman/Dictionary.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Wim Dumon
+ * Copyright (C) 2011 Emweb bvba, Heverlee, Belgium
  *
  * See the LICENSE file for terms of use.
  */
@@ -9,12 +9,12 @@
 #include <Wt/WStackedWidget>
 #include <Wt/WVBoxLayout>
 #include <Wt/WHBoxLayout>
+#include <Wt/WApplication>
 
 #include "HangmanGame.h"
 #include "LoginWidget.h"
 #include "HangmanWidget.h"
 #include "HighScoresWidget.h"
-#include "HangmanApplication.h"
 
 using namespace Wt;
 
@@ -23,55 +23,52 @@ HangmanGame::HangmanGame(WContainerWidget *parent):
   game_(0),
   scores_(0)
 {
-   WVBoxLayout *layout = new WVBoxLayout();
-   layout->setContentsMargins(0, 0, 0, 0);
-   this->setLayout(layout);
-
-   WText *title = new WText("<h1>A Witty game: Hangman</h1>");
-   layout->addWidget(title);
+  WVBoxLayout *layout = new WVBoxLayout();
+  layout->setContentsMargins(0, 0, 0, 0);
+  this->setLayout(layout);
+  
+  WText *title = new WText("<h1>A Witty game: Hangman</h1>");
+  layout->addWidget(title);
 
-   mainStack_ = new WStackedWidget(this);
-   mainStack_->setPadding(20);
-   layout->addWidget(mainStack_, 1, AlignCenter | AlignMiddle);
-   
-   mainStack_->addWidget(login_ = new LoginWidget());
+  mainStack_ = new WStackedWidget(this);
+  mainStack_->setPadding(20);
+  layout->addWidget(mainStack_, 1, AlignCenter | AlignMiddle);
+  
+  mainStack_->addWidget(login_ = new LoginWidget(&session_));
+  login_->loggedIn().connect(this, &HangmanGame::showGame);
 
-   WHBoxLayout *linksLayout = new WHBoxLayout();
-   linksLayout->setContentsMargins(0, 0, 0, 0);
-   layout->addLayout(linksLayout, 0, AlignCenter | AlignMiddle);
+  WHBoxLayout *linksLayout = new WHBoxLayout();
+  linksLayout->setContentsMargins(0, 0, 0, 0);
+  layout->addLayout(linksLayout, 0, AlignCenter | AlignMiddle);
 
-   backToGameAnchor_ = new WAnchor("/play", "Gaming Grounds");
-   linksLayout->addWidget(backToGameAnchor_, 0, AlignCenter | AlignMiddle);
-   backToGameAnchor_->setRefInternalPath("/play");
-   backToGameAnchor_->addStyleClass("link");
+  backToGameAnchor_ = new WAnchor("/play", "Gaming Grounds");
+  linksLayout->addWidget(backToGameAnchor_, 0, AlignCenter | AlignMiddle);
+  backToGameAnchor_->setRefInternalPath("/play");
+  backToGameAnchor_->addStyleClass("link");
 
-   scoresAnchor_ = new WAnchor("/highscores", "Highscores");
-   linksLayout->addWidget(scoresAnchor_, 0, AlignCenter | AlignMiddle);
-   scoresAnchor_->setRefInternalPath("/highscores");
-   scoresAnchor_->addStyleClass("link");
+  scoresAnchor_ = new WAnchor("/highscores", "Highscores");
+  linksLayout->addWidget(scoresAnchor_, 0, AlignCenter | AlignMiddle);
+  scoresAnchor_->setRefInternalPath("/highscores");
+  scoresAnchor_->addStyleClass("link");
 
-   HangmanApplication::instance()
-     ->internalPathChanged().connect(this, &HangmanGame::handleInternalPath);
+  WApplication::instance()->internalPathChanged()
+    .connect(this, &HangmanGame::handleInternalPath);
 
-   handleInternalPath();
+  showLogin();
 }
 
-void HangmanGame::handleInternalPath()
+void HangmanGame::handleInternalPath(const std::string &internalPath)
 {
-  HangmanApplication *app = HangmanApplication::instance();
-
-  if (app->internalPath() == "/play" && app->user)
+  if (internalPath == "/play" && session_.user())
     showGame();
-  else if (app->internalPath() == "/highscores")
+  else if (internalPath == "/highscores")
     showHighScores();
   else
     showLogin();
 }
 
 void HangmanGame::showLogin()
 {
-  HangmanApplication::instance()->setInternalPath("/");
-
   mainStack_->setCurrentWidget(login_);
   backToGameAnchor_->hide();
   scoresAnchor_->hide();
@@ -80,7 +77,7 @@ void HangmanGame::showLogin()
 void HangmanGame::showHighScores()
 {
   if (!scores_)
-    scores_ = new HighScoresWidget(mainStack_);
+    scores_ = new HighScoresWidget(&session_, mainStack_);
 
   mainStack_->setCurrentWidget(scores_);
   scores_->update();
@@ -94,8 +91,12 @@ void HangmanGame::showHighScores()
 
 void HangmanGame::showGame()
 {
-  if (!game_)
-    game_ = new HangmanWidget(mainStack_);
+  if (!game_) {
+    game_ = new HangmanWidget(session_.user()->name, 
+			      session_.dictionary(),
+			      mainStack_);
+    game_->updateScore().connect(&session_, &Session::addToScore);
+  }
 
   mainStack_->setCurrentWidget(game_);
 
@@ -105,4 +106,3 @@ void HangmanGame::showGame()
   backToGameAnchor_->addStyleClass("selected-link");
   scoresAnchor_->removeStyleClass("selected-link");
 }
-