Several changes:

    - fix websocket-based widgetset application reloading giving restart popup
    - remove redundant setPopup() calls and unnecessary z-index styles
    - wthttp: fix HTTP header value length error
    - win32: add version information to Wt when building DLLs.
    - WDatePicker: revert to a plain container for layout
    - current mariadb version does not have mysql_library_init

Author: Koen Deforche

CMakeLists.txt

@@ -20,7 +20,7 @@ SET(VERSION_SERIES 3)
 SET(VERSION_MAJOR 3)
 SET(VERSION_MINOR 2)
 
-SET(WT_SOVERSION 3)
+SET(WT_SOVERSION 37)
 SET(WTEXT_SOVERSION 37)
 SET(WTHTTP_SOVERSION 37)
 SET(WTFCGI_SOVERSION 37)

WConfig.h.in

@@ -2,9 +2,9 @@
 #define WCONFIG_H
 
 // Version defines
-#define WT_SERIES 0x${VERSION_SERIES}
-#define WT_MAJOR  0x${VERSION_MAJOR}
-#define WT_MINOR  0x${VERSION_MINOR}
+#define WT_SERIES ${VERSION_SERIES}
+#define WT_MAJOR  ${VERSION_MAJOR}
+#define WT_MINOR  ${VERSION_MINOR}
 
 /*! \brief A constant that encodes the library version of %Wt
  *

cmake/WtFindMysql.txt

@@ -68,3 +68,15 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 
+INCLUDE (CheckSymbolExists)
+# mariadb 1.0.0 does not have mysql_library_init
+IF(MYSQL_FOUND)
+  SET(CMAKE_REQUIRED_FLAGS "")
+  SET(CMAKE_REQUIRED_DEFINITIONS "")
+  SET(CMAKE_REQUIRED_LIBRARIES "")
+  SET(CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE})
+  CHECK_SYMBOL_EXISTS(mysql_library_init mysql.h MYSQL_HAVE_LIBRARY_INIT)
+  IF(NOT MYSQL_HAVE_LIBRARY_INIT)
+    SET(MYSQL_DEFINITIONS "-DMYSQL_NO_LIBRARY_INIT")
+  ENDIF(NOT MYSQL_HAVE_LIBRARY_INIT)
+ENDIF(MYSQL_FOUND)

resources/themes/bootstrap/2/wt.css

@@ -414,7 +414,6 @@
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  z-index: 2;
 }
 .Wt-slider-h .handle:hover,
 .Wt-slider-h .handle:active,
@@ -489,7 +488,6 @@
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  z-index: 2;
 }
 .Wt-slider-v .handle:hover,
 .Wt-slider-v .handle:active,

resources/themes/bootstrap/2/wt.less

@@ -400,7 +400,6 @@
 	.buttonBackground(@btnBackground, @btnBackgroundHighlight,
 			  @grayDark, 0 1px 1px rgba(255,255,255,.75));
 	.border-radius(@baseBorderRadius);
-	z-index: 2;
 
 	&:hover {
 	    background-color: darken(@white, 10%);
@@ -450,7 +449,6 @@
 	.buttonBackground(@btnBackground, @btnBackgroundHighlight,
 			  @grayDark, 0 1px 1px rgba(255,255,255,.75));
 	.border-radius(@baseBorderRadius);
-	z-index: 2;
 
 	&:hover {
 	    background-color: darken(@white, 10%);

resources/themes/bootstrap/3/wt.css

@@ -427,7 +427,6 @@
 
 .Wt-slider-h .handle {
   top: 50% !important;
-  z-index: 2;
   height: 18px !important;
   margin-top: -10px;
   color: #333333;
@@ -511,7 +510,6 @@ fieldset[disabled] .Wt-slider-h .handle.active {
 
 .Wt-slider-v .handle {
   left: 50% !important;
-  z-index: 2;
   width: 18px !important;
   margin-left: -10px;
   color: #333333;

resources/themes/bootstrap/3/wt.less

@@ -413,7 +413,6 @@
         border: 1px solid @btn-default-border;
 	border-radius: @border-radius-base;
 	.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
-	z-index: 2;
 
 	&:hover {
 	    background-color: darken(white, 10%);
@@ -462,7 +461,6 @@
         border: 1px solid @btn-default-border;
 	border-radius: @border-radius-base;
 	.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
-	z-index: 2;
 
 	&:hover {
 	    background-color: darken(white, 10%);
@@ -560,7 +558,6 @@
 	}
     }
 
-
     /* resize handles */
     .Wt-tv-rh {
 	float: right;

src/CMakeLists.txt

@@ -418,6 +418,14 @@ IF(RT_required)
   SET(RT_LIBRARY "rt")
 ENDIF(RT_required)
 
+IF(WIN32)
+  IF(SHARED_LIBS)
+    CONFIGURE_FILE(Wt/wt-version.rc.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/wt-version.rc)
+    SET(libsources ${libsources} ${CMAKE_CURRENT_BINARY_DIR}/wt-version.rc)
+  ENDIF(SHARED_LIBS)
+ENDIF(WIN32)
+
 ADD_LIBRARY(wt ${libsources})
 TARGET_LINK_LIBRARIES(wt
     ${BOOST_WT_LIBRARIES}

src/Wt/Dbo/CMakeLists.txt

@@ -1,4 +1,13 @@
+IF(WIN32)
+  IF(SHARED_LIBS)
+    CONFIGURE_FILE(wtdbo-version.rc.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/wtdbo-version.rc)
+    SET(wtdboversionrc ${CMAKE_CURRENT_BINARY_DIR}/wtdbo-version.rc)
+  ENDIF(SHARED_LIBS)
+ENDIF(WIN32)
+
 ADD_LIBRARY(wtdbo
+  ${wtdboversionrc}
   ptr.C
   Call.C
   DbAction.C

src/Wt/Dbo/Json

@@ -217,8 +217,10 @@ private:
     bool first_;
     Session *session_;
 
-    template<typename T>
-    void out(T t);
+    void out(char);
+    void out(const char *);
+    void out(int);
+    void out(long long);
 
     template<typename T>
     void outputId(T id) {