avoid include/lib mismatches, and fix WSubMenu error (#944)

Author: Koen Deforche

WConfig.h.in

@@ -13,11 +13,22 @@
 #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}"
 #define WTHTTP_CONFIGURATION "${WTHTTP_CONFIGURATION}"
 
+
 #cmakedefine WT_STATIC
 #cmakedefine WTDBO_STATIC
 #cmakedefine WTDBOPOSTGRES_STATIC

doc/tutorial/dbo/tutorial.doc

@@ -1158,8 +1158,7 @@ The minimum level of isolation which is required for the library's
 _optimistic locking_ strategy is _Read Committed_: modifications in a
 transaction are only visible to other sessions as soon as they are
 committed. This is usually the lowest level of isolation supported by
-a database (SQLite3 is currently the only backend and provides this
-isolation level by default).
+a database.
 
 The +Transaction+ class is a light-weight proxy that references a
 _logical_ transaction: multiple (usually nested) Transaction objects
@@ -1192,3 +1191,30 @@ least need to
 +{doc}classWt_1_1Dbo_1_1ptr.html#abb1db71ef910748437d69bf11a04eb6e[reread()]+
 the stale database object(s) before being able to commit changes made
 in a new transaction.
+
+== Installing +Wt::Dbo+
+
++Wt::Dbo+ is included in Wt, and can thus be installed as part of this
+library for which there may be standard packages availabe for your
+operating system.
+
+The library does however in no way depend on Wt, and can also be
+built, installed and used separately from it. Starting from a Wt
+source package (and on in a UNIX-like environment), you would do the
+following to build and install only +Wt::Dbo+:
+
+.Installing +Wt::Dbo+ from source (UNIX-like)
+[source,sh]
+----
+$ cd wt-xxx
+$ mkdir build
+$ cd build
+$ cmake ../ # extra options may be needed for locating boost, postgres, install directory, ...
+$ cd src/Wt/Dbo
+$ make
+$ sudo make install
+----
+
+See also the
+http://www.webtoolkit.eu/wt/doc/reference/html/InstallationUnix.html[Wt
+installation instructions].

src/Wt/WApplication

@@ -205,7 +205,12 @@ public:
    * The \p environment provides information on the initial request,
    * user agent, and deployment-related information.
    */
+#if defined(DOXYGEN_ONLY) || defined(WT_TARGET_JAVA) 
   WApplication(const WEnvironment& environment);
+#else
+  WApplication(const WEnvironment& environment,
+	       WtLibVersion version = WT_INCLUDED_VERSION);
+#endif
 
 #ifndef WT_TARGET_JAVA
   /*! \brief Destructor.

src/Wt/WApplication.C

@@ -40,6 +40,8 @@ namespace skeletons {
 
 namespace Wt {
 
+const WtLibVersion WT_INCLUDED_VERSION = WtLibVersion();
+
 const char *WApplication::RESOURCES_URL = "resourcesURL";
 
 WApplication::ScriptLibrary::ScriptLibrary(const std::string& anUri,
@@ -69,7 +71,11 @@ bool WApplication::ScriptLibrary::operator== (const ScriptLibrary& other) const
   return uri == other.uri;
 }
 
-WApplication::WApplication(const WEnvironment& env)
+WApplication::WApplication(const WEnvironment& env
+#if !(defined(DOXYGEN_ONLY) || defined(WT_TARGET_JAVA))
+			   , WtLibVersion version
+#endif
+)
   : session_(env.session_),
 #ifndef WT_CNOR
     weakSession_(session_->shared_from_this()),

src/Wt/WMenu

@@ -288,6 +288,8 @@ public:
    *
    * Select the menu item \p item.
    *
+   * When \p item is \c 0, the current selection is removed.
+   *
    * \sa select(int), currentItem(), WMenuItem::select()
    */
   void select(WMenuItem *item);
@@ -297,6 +299,8 @@ public:
    * Menu items in a menu with \p N items are numbered from 0 to
    * \p N - 1.
    *
+   * Using a value of -1 removes the current selection.
+   *
    * \sa select(WMenuItem *), currentIndex()
    */
   void select(int index);

src/Wt/WMenu.C

@@ -252,7 +252,7 @@ void WMenu::itemPathChanged(WMenuItem *item)
     WApplication *app = wApp;
 
     if (app->internalPathMatches(basePath_ + item->pathComponent()))
-      select(indexOf(item), false);
+      item->setFromInternalPath(app->internalPath());
   }
 }
 
@@ -466,7 +466,7 @@ void WMenu::internalPathChanged(const std::string& path)
       items_[bestI]->setFromInternalPath(path);
     else {
       if (!subPath.empty())
-	wApp->log("error") << "WMenu: unknown path: '"<< subPath << "'";
+	wApp->log("warn") << "WMenu: unknown path: '"<< subPath << "'";
       else
 	select(-1, false);
     }