Several changes:

 - Merges from master:
  - Discard form object that fails to encode properly
  - Make sure unrender comes before setHtml
    Fixes an issue where changing the template text could cause an error
    when there's a WTextEdit in it.
  - GraphicsMagick: define NOMINMAX on windows
  - IE doesn't support startsWith; use indexOf
 - Wt 4 specific:
  - Seperate -> separate
  - Added missing parentheses to extensionless headers
  - Fixed benchmark.cpp includes, environ, compile problems
  - Updated installation instructions
  - Fixed example compile issues on Windows

Author: RockinRoel

CMakeLists.txt

@@ -392,8 +392,7 @@ IF(NOT BOOST_WT_FOUND)
       "are not defined). When set to true, method 2 is used.\n"
       "Note 2: the code to discover boost is located in cmake/WtFindBoost.txt\n"
       "Note 3: on windows, set BOOST_PREFIX to the full path, eg "
-      "c:/Program Files/boost/boost_1_38\n\n"
-      "Wt requires the following C++ boost libraries: program_options and random")
+      "c:/Program Files/boost/boost_1_65_1")
   MESSAGE(FATAL_ERROR ${ERR})
 ENDIF(NOT BOOST_WT_FOUND)
 

INSTALL

@@ -26,28 +26,31 @@ <h2>Requirements</h2>
 and libwthttp. To use the ISAPI connector, you have to link to libwtisapi
 instead of libwthttp.</p>
 
+<p>The prebuilt binaries for Visual Studio include all necessary and optional dependencies,
+and enable all features of Wt and can be downloaded from the
+<a href="https://github.com/emweb/wt/releases">releases page on GitHub</a>.</p>
+
 <p>Requirements:
 <ul>
-  <li>Microsoft Visual Studio C++ 2005 or newer. Wt and its dependencies also
-      build on the Express Edition, which is free (as in beer) to use.
-  <li>CMake cross-platform build system (www.cmake.org): cmake-2.6.x,
-      Windows version (2.8 or newer recommended).</li>
+  <li>Microsoft Visual Studio 2015 or newer. Wt and its dependencies also
+      build on the Community Edition, which is free (as in beer) to use.
+  <li>CMake cross-platform build system (www.cmake.org): cmake-3.1.x or higher</li>
   <li>Boost 1.46.1 (or later; a recent version is recommended)</li>
 </ul>
 </p>
 
 <p>Additional and optional requirements for some of the examples
 <ul>
-<li>For https support: OpenSSL, version 0.9.8d or newer.</li>
-<li>To compress traffic: zlib 1.2.3</li>
-<li>Postgres, mysql, firebird client libraries for Dbo database backends</li>
+<li>For HTTPS support: OpenSSL, version 0.9.8d or newer.</li>
+<li>To compress traffic: zlib</li>
+<li>PostgreSQL, MySQL, Firebird client libraries for Dbo database backends</li>
 <li><a href="http://libharu.org/">Haru Free PDF Library</a>, which is used to
 provide support for rendering PDF (WPdfImage, WPdfRenderer).</li>
 </ul>
 </p>
 
 <p>
-We stronly recommend to use libraries which are all built using the same
+We strongly recommend to use libraries which are all built using the same
 compiler and the same runtime configuration (/MT, /MD, /MTd
 or /MDd) to avoid incompatibilities with the C runtime libraries. Mixing
 CRTs is NOT recommended, the <a href="http://www.zlib.net/DLL_FAQ.txt">zlib
@@ -60,14 +63,18 @@ <h2>Requirements</h2>
 
 <h2>Step by step instructions to build and install the Wt library</h2>
 
+<p>
 Up to date instructions are located on the Wt wiki page:
 <a href="http://redmine.emweb.be/projects/wt/wiki/Installing_Wt_on_MS_Windows">Installing Wt on MS Windows</a>
+</p>
 
+<p>
 Instructions on how to use the ISAPI connector for deployment under IIS are
 also available on the wiki page:
 <a href="http://redmine.emweb.be/projects/wt/wiki/ISAPI_on_Microsoft_IIS">ISAPI on Microsoft IIS</a>
+</p>
 
-<h2>Trying the examples (or your own Wt application) using wthttpd</h3>
+<h2>Trying the examples (or your own Wt application) using wthttpd</h2>
 
 <h4>1. Run the example in the MSVC IDE </h4>
 
@@ -83,7 +90,7 @@ <h4>1. Run the example in the MSVC IDE </h4>
 href="http://127.0.0.1:8080/hello">http://127.0.0.1:8080/hello</a></p>
 
 <p>
-Examples that need extra files to run, should be executed from their source
+Examples that need extra files to run should be executed from their source
 directory in order to find their dependency files (icons, css files, etc.
 Watch for 404 errors in Wt's output). To do so, set the 'Working directory'
 for the example to wt-x.y.z/examples/ExampleName. Some examples (e.g. the
@@ -92,6 +99,7 @@ <h4>1. Run the example in the MSVC IDE </h4>
 problem. Other examples (such as the Charts example) may require the
 installation of ExtJs. See the Wt reference manual for more information
 on how to obtain and install ExtJs. 
+</p>
 
 <p>
 These are all the command-line options that are available (run the examples

INSTALL.html

@@ -42,6 +42,18 @@ IF("${CMAKE_CURRENT_LIST_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
     find_package(Boost)
     find_package(Wt REQUIRED Wt HTTP)
 
+    set_target_properties(Wt::Wt PROPERTIES
+      MAP_IMPORTED_CONFIG_RELEASE MinSizeRel
+      MAP_IMPORTED_CONFIG_RELWITHDEBINFO MinSizeRel
+    )
+    set_target_properties(Wt::HTTP PROPERTIES
+      MAP_IMPORTED_CONFIG_RELEASE MinSizeRel
+      MAP_IMPORTED_CONFIG_RELWITHDEBINFO MinSizeRel
+    )
+
+    SET(HAVE_HARU true)
+    SET(HARU_LIB optimized libhpdf debug libhpdfd)
+
     SET(EXAMPLES_CONNECTOR Wt::HTTP)
     SET(EXAMPLES_WT_LIB Wt::Wt)
     SET(EXAMPLES_WTDBO_LIB Wt::Dbo)

INSTALL.win32.html

@@ -5,23 +5,26 @@
 #include <vector>
 #include <algorithm>
 
-#include <Wt/WServer>
-#include <Wt/WResource>
-#include <Wt/Http/Request>
-#include <Wt/Http/Response>
-#include <Wt/WTemplate>
-#include <Wt/Utils>
-
-#include <Wt/Dbo/Dbo>
-#include <Wt/Dbo/Json>
+#include <Wt/WServer.h>
+#include <Wt/WResource.h>
+#include <Wt/Http/Request.h>
+#include <Wt/Http/Response.h>
+#include <Wt/WTemplate.h>
+#include <Wt/Utils.h>
+
+#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Json.h>
 #ifndef BENCHMARK_USE_POSTGRES
-#include <Wt/Dbo/backend/MySQL>
+#include <Wt/Dbo/backend/MySQL.h>
 #else
-#include <Wt/Dbo/backend/Postgres>
+#include <Wt/Dbo/backend/Postgres.h>
 #endif
 
-#include <boost/random/uniform_int_distribution.hpp>
-#include <boost/random/taus88.hpp>
+#include <random>
+
+#ifndef WT_WIN32
+extern char **environ;
+#endif // WT_WIN32
 
 class MyMessage {
 public:
@@ -115,8 +118,8 @@ struct DbStruct {
   MyConnection *connection;
   Wt::Dbo::Session session;
 
-  boost::taus88 rng;
-  boost::random::uniform_int_distribution<int> distribution;
+  std::default_random_engine rng;
+  std::uniform_int_distribution<int> distribution;
 
   DbStruct()
     : connection(0),

examples/CMakeLists.txt

@@ -39,6 +39,7 @@ WT_ADD_EXAMPLE(widgetgallery.wt
 
 IF (HAVE_HARU)
   INCLUDE_DIRECTORIES(${HARU_INCLUDE_DIRS})
+  TARGET_LINK_LIBRARIES(widgetgallery.wt ${HARU_LIB})
 ENDIF(HAVE_HARU)
 
 #

examples/te-benchmark/benchmark.cpp

@@ -11,7 +11,7 @@
 #if defined(__GNUC__) || defined(__clang__)
 #warning "The use of header files without .h is deprecated since Wt 4.0.0, please use WQApplication.h instead"
 #elif defined(_MSC_VER)
-#pragma message("The use of header files without .h is deprecated since Wt 4.0.0, please use WQApplication.h instead"
+#pragma message("The use of header files without .h is deprecated since Wt 4.0.0, please use WQApplication.h instead")
 #endif
 #endif // defined(WT_WARN_HEADER_MISSING_H)
 #include "WApplication.h"

examples/widgetgallery/CMakeLists.txt

@@ -400,7 +400,7 @@ SET(libsources ${libsources}
 
 IF(HAVE_HARU)
   SET(libsources ${libsources} Wt/WPdfImage.C Wt/Render/WPdfRenderer.C)
-  SET(BOOST_WT_LIBRARIES ${BOOST_WT_LIBRARIES} ${BOOST_FS_LIB})
+  SET(BOOST_WT_LIBRARIES ${BOOST_WT_LIBRARIES})
   ADD_DEFINITIONS(-DHAVE_PDF_IMAGE)
 ENDIF(HAVE_HARU)
 
@@ -530,12 +530,7 @@ ELSE(HAVE_SSL)
 ENDIF(HAVE_SSL)
 
 IF(HAVE_HARU)
-  TARGET_LINK_LIBRARIES(wt
-    PUBLIC
-      ${HARU_LIB}
-    PRIVATE
-      ${HARU_SUPPORT_LIBS}
-  )
+  TARGET_LINK_LIBRARIES(wt PRIVATE ${HARU_LIBRARIES})
   INCLUDE_DIRECTORIES(${HARU_INCLUDE_DIRS})
 ELSE(HAVE_HARU)
   MESSAGE("** Disabling PDF support (WPdfImage, WPdfRenderer): requires libharu.")

examples/wtwithqt/lib/WQApplication

@@ -11,7 +11,7 @@
 #if defined(__GNUC__) || defined(__clang__)
 #warning "The use of header files without .h is deprecated since Wt 4.0.0, please use AbstractPasswordService.h instead"
 #elif defined(_MSC_VER)
-#pragma message("The use of header files without .h is deprecated since Wt 4.0.0, please use AbstractPasswordService.h instead"
+#pragma message("The use of header files without .h is deprecated since Wt 4.0.0, please use AbstractPasswordService.h instead")
 #endif
 #endif // defined(WT_WARN_HEADER_MISSING_H)
 #include "AbstractPasswordService.h"