fixing Windows build issues

Author: Koen Deforche

CMakeLists.txt

@@ -34,6 +34,9 @@ IF(NOT SHARED_LIBS)
   SET(WT_STATIC true)
   SET(WTHTTP_STATIC true)
   SET(WT_EXT_STATIC true)
+  SET(WTDBO_STATIC true)
+  SET(WTDBOSQLITE3_STATIC true)
+  SET(WTDBOPOSTGRES_STATIC true)
 ENDIF(NOT SHARED_LIBS)
 
 IF(NOT MULTI_THREADED)
@@ -79,6 +82,7 @@ IF(WIN32)
   SET(BOOST_DIR "c:/Program Files/Boost" CACHE PATH "Use boost in directory")
   SET(GD_DIR ${USERLIB_ROOT} CACHE PATH "Search path for libgd")
   OPTION(BOOST_DYNAMIC "Link to boost DLLs (OFF means static link)" OFF)
+  SET(POSTGRES_ROOT "c:/libraries" CACHE PATH "directory containing postgresql (overrides USERLIB_ROOT)")
 ELSE(WIN32)
   SET(USERLIB_ROOT /usr CACHE PATH "Other installation prefix for dependent libraries")
   SET(LIB_INSTALL_DIR "lib" CACHE STRING "Default path for libraries within ${CMAKE_INSTALL_PREFIX}")
@@ -89,6 +93,7 @@ ELSE(WIN32)
   SET(DEPLOYROOT /var/www/localhost/htdocs/wt-examples CACHE PATH "Path to deploy examples into)")
   SET(BOOST_DIR /usr CACHE PATH "Boost installation path prefix")
   SET(GD_DIR "/usr/lib" CACHE PATH "Search path for libgd2")
+  SET(POSTGRES_ROOT "/usr" CACHE PATH "directory containing postgresql (overrides USERLIB_ROOT)")
 ENDIF(WIN32)
 
 OPTION(DEBUG "Support for debugging, must be enabled also in wt_config.xml" OFF)

ReleaseNotes.html

@@ -26,6 +26,8 @@ <h2>Release 3.1.2 (March 26, 2010)</h2>
 <h3>A) New classes:</h3>
 
 <dl>
+  <dt><a href="classWt_1_1WShadow.html">WShadow</a></dt>
+  <dd>Class representing a drop shadow effect (see below).</dd>
   <dt><a href="classWt_1_1Dbo_1_1backend_1_1Postgres.html">Dbo/backend/Postgres</a></dt>
   <dd>A Postgres backend has landed, contributed by Hilary Cheng.</dd>
 </dl>
@@ -46,6 +48,9 @@ <h3>B) Main new features in existing classes:</h3>
     <tt>boost::posix_time::ptime</tt>.</dd>
   <dt><a href="classWt_1_1WFormWidget.html">WFormWidget</a></dt>
   <dd>Added a <a href="classWt_1_1WFormWidget.html#92de7a4d9ca6796607dc9fd26f608436">setEmptyText()</a> method to implement a label inside a line edit or text area.</dd>
+  <dt><a href="classWt_1_1WPainter.html">WPainter</a></dt>
+  <dd>Added a <a href="classWt_1_1WPainter.html#06bb9dbe3ae195c320cfed7b062d448a">setShadow()</a> method which defines a drop shadow to be used for subsequent
+  drawing actions.</dd>
   <dt><a href="classWt_1_1WResource.html">WResource</a></dt>
   <dd>Added a <a href="classWt_1_1WResource.html#06bb9dbe3ae195c320cfed7b062d448a">setInternalPath()</a> method which allow a resource to be deployed at a deterministic and "pretty" URL.</dd>
   <dt><a href="classWt_1_1WString.html">WString</a></dt>

WConfig.h.in

@@ -19,8 +19,12 @@
 #define WTHTTP_CONFIGURATION "${WTHTTP_CONFIGURATION}"
 
 #cmakedefine WT_STATIC
+#cmakedefine WTDBO_STATIC
+#cmakedefine WTDBOPOSTGRES_STATIC
+#cmakedefine WTDBOSQLITE3_STATIC
 #cmakedefine WTHTTP_STATIC
 #cmakedefine WT_EXT_STATIC
+#cmakedefine WT_EXT_STATIC
 
 #if ${WT_DEBUG_ENABLED}
 #ifndef WT_TARGET_JAVA

cmake/WtFindPostgresql.txt

@@ -4,10 +4,14 @@
 # - POSTGRES_FOUND
 #
 
-FIND_LIBRARY(POSTGRES_LIBRARIES pq
+FIND_LIBRARY(POSTGRES_LIBRARIES
+  NAMES
+    pq libpq
+  PATHS
     /usr/lib
     /usr/local/lib
     /opt/local/lib	
+    ${POSTGRES_ROOT}/lib
     ${USERLIB_ROOT}/lib
 )
 
@@ -18,6 +22,8 @@ FIND_PATH(POSTGRES_INCLUDE libpq-fe.h
     /usr/local/include/postgresql
     /opt/local/include	
     /opt/local/include/postgresql
+    ${POSTGRES_ROOT}/include
+    ${POSTGRES_ROOT}/postgresql/include
     ${USERLIB_ROOT}/include
     ${USERLIB_ROOT}/postgresql/include
 )

examples/filetreetable/FileTreeTableNode.C

@@ -27,7 +27,7 @@ FileTreeTableNode::FileTreeTableNode(const boost::filesystem::path& path)
 
   if (boost::filesystem::exists(path)) {
     if (!boost::filesystem::is_directory(path)) {
-      int fsize = boost::filesystem::file_size(path);
+      int fsize = (int)boost::filesystem::file_size(path);
       setColumnWidget(1, new WText(boost::lexical_cast<std::wstring>(fsize)));
       columnWidget(1)->setStyleClass("fsize");
     } else

examples/painting/PaintExample.C

@@ -20,18 +20,24 @@ PaintExample::PaintExample(WContainerWidget *root, bool showTitle)
   std::string text;
   if (showTitle)
     text += "<h2>Paint example</h2>";
+
   text += 
     "<p>A simple example demonstrating cross-browser vector graphics."
     "</p>"
-    "<p>The emweb logo below is painted using the Wt WPainter API from bezier paths, and "
-    "rendered to the browser using inline SVG, inline VML or the "
-    "HTML 5 &lt;canvas&gt; element."
+    "<p>The emweb logo below is painted using the Wt WPainter API from "
+    "bezier paths, and rendered to the browser using inline SVG, inline VML "
+    "or the HTML 5 &lt;canvas&gt; element."
     "</p>"
     "<p>"
     "The example also demonstrates the horizontal and vertical "
     "<a href=\"http://www.webtoolkit.eu/wt/doc/reference/html/classWt_1_1WSlider.html\" target=\"_blank\">"
-    "WSlider</a> widgets. Here, the events of the WSlider"
-    "widgets are used to scale and rotate the emweb logo."
+    "WSlider</a> widgets (which are rendered using vector graphics). Here, "
+    "the events of the WSlider widgets are used to scale and rotate the "
+    "emweb logo."
+    "</p>"
+    "<p>"
+    "In non-IE browsers, a different backend is used for positive or negative "
+    "angles (SVG or HTML canvas)."
     "</p>";
 
   new WText(text, this);

examples/painting/ShapesWidget.C

@@ -53,6 +53,7 @@ void ShapesWidget::paintEvent(WPaintDevice *paintDevice)
 {
   WPainter painter(paintDevice);
 
+  painter.setShadow(WShadow(10, 10, WColor(0, 0, 0, 50), 10));
   painter.setRenderHint(WPainter::Antialiasing);
 
   painter.translate(width().value()/2, height().value()/2);
@@ -108,8 +109,8 @@ void ShapesWidget::drawEmwebMW(WPainter& painter)
   p.cubicTo(144.14176,24.512492,149.113,21.235634,156.98545,21.235634);
   p.cubicTo(164.8499,21.235634,169.81314,24.512492,173.10599,31.841463);
   p.cubicTo(176.10311,38.53904,176.215,45.708164,176.215,45.780095);
-  p.lineTo(176.215,80.41343);
-  p.lineTo(197.97014,80.41343);
+  p.lineTo(176.215,70.41343);
+  p.lineTo(197.97014,70.41343);
   p.lineTo(197.97014,45.732141);
   p.cubicTo(197.97014,44.605222,197.83427,34.518895,193.35057,24.072913);
   p.cubicTo(186.70894,8.5517985,173.77734,0,156.99344,0);

examples/wt-homepage/ExampleSourceViewer.C

@@ -101,7 +101,7 @@ void ExampleSourceViewer::setExample(const std::string& exampleDir,
   bool exists = false;
   try {
     exists = fs::exists(exampleDir);
-  } catch (std::exception& e) {
+  } catch (std::exception&) {
   }
 
   if (!exists) {

examples/wt-homepage/SourceView.C

@@ -78,7 +78,7 @@ std::string getLanguageFromFileExtension(const std::string &fileName)
 
 std::string readFileToString(const std::string& fileName) 
 {
-  std::size_t outputFileSize = fs::file_size(fileName);
+  std::size_t outputFileSize = (std::size_t)fs::file_size(fileName);
   std::fstream file (fileName.c_str(), std::ios::in | std::ios::binary);
   char* memblock = new char [outputFileSize];
   file.read(memblock, outputFileSize);

examples/wt-homepage/jwt-home.xml

@@ -635,7 +635,7 @@ you may share tips, notes and experiences using JWt.
 
       <p>
 	Browse below the source code for all examples included in 
-	<a href="http://webtoolkit.eu/jwt">JWt</a>.
+	<a href="http://www.webtoolkit.eu/jwt">JWt</a>.
       </p>
     </div>
   </message>
@@ -648,7 +648,7 @@ you may share tips, notes and experiences using JWt.
 
       <p>
 	Browse below the source code for JWt's 
-	<a href="http://webtoolkit.eu/jwt/examples/hello_world">
+	<a href="http://www.webtoolkit.eu/jwt/examples/hello_world">
 	  Hello world</a> example.
       </p>
     </div>
@@ -662,7 +662,7 @@ you may share tips, notes and experiences using JWt.
 
       <p>
 	Browse below the source code for JWt's 
-	<a href="http://webtoolkit.eu/jwt/examples/hello_world">
+	<a href="http://www.webtoolkit.eu/jwt/examples/hello_world">
 	  Hello world</a> example.
       </p>
     </div>
@@ -676,7 +676,7 @@ you may share tips, notes and experiences using JWt.
 
       <p>
 	Browse below the source code for JWt's 
-	<a href="http://webtoolkit.eu/jwt/examples/charts">
+	<a href="http://www.webtoolkit.eu/jwt/examples/charts">
 	  Charts</a> example.
       </p>
     </div>
@@ -690,7 +690,7 @@ you may share tips, notes and experiences using JWt.
 
       <p>
 	Browse below the source code for JWt's 
-	<a href="http://webtoolkit.eu/jwt/examples/treeview">
+	<a href="http://www.webtoolkit.eu/jwt/examples/treeview">
 	  Treeview</a> example.
       </p>
     </div>
@@ -704,7 +704,7 @@ you may share tips, notes and experiences using JWt.
 
       <p>
 	Browse below the source code for JWt's 
-	<a href="http://webtoolkit.eu/jwt/examples/composer">
+	<a href="http://www.webtoolkit.eu/jwt/examples/composer">
 	  Mail composer</a> example.
       </p>
     </div>