merged in bootstrap branch

Author: Koen Deforche

.gitignore

@@ -1,9 +1,24 @@
 *~
-.DS_Store
 *.db
+*.autosave
 build*/*
+.DS_Store
+CMakeLists.txt.user
+wt.tags
+doc/tutorial/auth.html
+doc/tutorial/dbo.html
+doc/tutorial/wt.html
 doc/reference
 doc/examples
 examples/*/resources
+examples/hello/*.svg
+examples/widgetgallery/docroot/resources
 resources/tiny_mce
-test/interactive
+test/interactive
+
+
+
+
+
+
+

CMakeLists.txt

@@ -12,20 +12,20 @@ PROJECT(WT)
 SET(CMAKE_MODULE_PATH ${WT_SOURCE_DIR} ${WT_SOURCE_DIR}/cmake)
 
 SET(VERSION_SERIES 3)
-SET(VERSION_MAJOR 2)
-SET(VERSION_MINOR 3)
-
-SET(WT_SOVERSION 34)
-SET(WTEXT_SOVERSION 34)
-SET(WTHTTP_SOVERSION 34)
-SET(WTFCGI_SOVERSION 34)
-SET(WTISAPI_SOVERSION 11)
-SET(WTDBO_SOVERSION 34)
-SET(WTDBOSQLITE3_SOVERSION 34)
-SET(WTDBOPOSTGRES_SOVERSION 34)
-SET(WTDBOFIREBIRD_SOVERSION 34)
-SET(WTDBOMYSQL_SOVERSION 34)
-SET(WTTEST_SOVERSION 4)
+SET(VERSION_MAJOR 3)
+SET(VERSION_MINOR 0)
+
+SET(WT_SOVERSION 35)
+SET(WTEXT_SOVERSION 35)
+SET(WTHTTP_SOVERSION 35)
+SET(WTFCGI_SOVERSION 35)
+SET(WTISAPI_SOVERSION 12)
+SET(WTDBO_SOVERSION 35)
+SET(WTDBOSQLITE3_SOVERSION 35)
+SET(WTDBOPOSTGRES_SOVERSION 35)
+SET(WTDBOFIREBIRD_SOVERSION 35)
+SET(WTDBOMYSQL_SOVERSION 35)
+SET(WTTEST_SOVERSION 5)
 
 IF(NOT SHARED_LIBS)
   IF(WIN32)
@@ -94,7 +94,7 @@ OPTION(ENABLE_SSL "Enable cryptography functions, using OpenSSL" ON)
 OPTION(ENABLE_GM "Enable GraphicsMagick, for supporting painting to raster images (PNG, GIF, ...) (WRasterImage)" ON)
 OPTION(ENABLE_HARU "Enable Haru Free PDF Library, which is used to provide support for painting to PDF (WPdfImage)" ON)
 OPTION(ENABLE_PANGO "Enable Pango Library, which is used for improved font support (WPdfImage and WRasterImage)" ON)
-OPTION(ENABLE_EXT "Build Wt Ext library with JavaScript-only widgets (http://extjs.com/)" ON)
+OPTION(ENABLE_EXT "Build Wt Ext library with JavaScript-only widgets (http://extjs.com/) DEPRECATED" OFF)
 OPTION(ENABLE_SQLITE "Build SQLite3 backend for Wt::Dbo" ON)
 OPTION(ENABLE_POSTGRES "Build PostgreSQL backend for Wt::Dbo" ON)
 OPTION(ENABLE_FIREBIRD "Build FirebirdSQL backend for Wt::Dbo" ON)
@@ -130,6 +130,7 @@ IF(NOT SHARED_LIBS)
   SET(WTDBOSQLITE3_STATIC true)
   SET(WTDBOPOSTGRES_STATIC true)
   SET(WTDBOFIREBIRD_STATIC true)
+  SET(WTDBOMYSQL_STATIC true)
 ENDIF(NOT SHARED_LIBS)
 
 IF(NOT MULTI_THREADED)
@@ -273,7 +274,6 @@ ELSE(WIN32)
 ENDIF(WIN32)
 OPTION(CONNECTOR_HTTP "Compile in stand-alone httpd connector (libwthttp) ?" ON)
 SET(EXAMPLES_CONNECTOR wthttp CACHE STRING "Connector used for examples")
-SET(TEST_DBO_BACKEND sqlite CACHE STRING "Dbo backed used for running the test suite")
 
 include (CheckSymbolExists)
 

Changelog

@@ -1,3 +1,8 @@
+25-01-2013:
+	* Merged in bootstrap branch, with many additions, changes and above
+	all addition of support for Twitter's Bootstrap framework as a new
+	theme
+
 12-12-2012:
 	* Added binary WebGL VBO buffers, contributed by Tassilo Glander
 

Doxyfile

@@ -24,6 +24,7 @@
 #cmakedefine WTDBOPOSTGRES_STATIC
 #cmakedefine WTDBOSQLITE3_STATIC
 #cmakedefine WTDBOFIREBIRD_STATIC
+#cmakedefine WTDBOMYSQL_STATIC
 #cmakedefine WTHTTP_STATIC
 #cmakedefine WT_EXT_STATIC
 #cmakedefine WT_EXT_STATIC

WConfig.h.in

@@ -17,13 +17,14 @@ FIND_PATH(MYSQL_INCLUDE mysql.h
     /usr/local/include/mysql
 )
 
-SET(MYSQL_LIBRARY "mariadb;mariadbclient" CACHE STRING "Library that provides MySQL/MariaDB API")
+SET(MYSQL_LIBRARY "mariadb;mariadbclient" CACHE STRING "Library that provides MySQL/MariaDB API (set to mysqlclient for mysql on unix; libmysql on windows)")
 
 FIND_LIBRARY(MYSQL_LIB
     NAMES
 	${MYSQL_LIBRARY}
     PATHS
     ${MYSQL_PREFIX}/lib
+    ${MYSQL_PREFIX}/lib/opt
     /usr/lib
     /usr/local/lib
     /opt/local/lib

cmake/WtFindMysql.txt

@@ -160,5 +160,27 @@ SUBDIRS(
   webgl
   wt-homepage
   wtwithqt
-  widgetgallery
 )
+
+IF(MSVC_VERSION)
+  IF(MSVC_VERSION GREATER 1600)
+    SET(HAS_CXX11 ON)
+  ENDIF(MSVC_VERSION GREATER 1600)
+ENDIF(MSVC_VERSION)
+IF(CMAKE_COMPILER_IS_GNUCXX)
+  execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                  OUTPUT_VARIABLE GCC_VERSION)
+  IF(${GCC_VERSION} VERSION_GREATER "4.6.0")
+    SET(HAS_CXX11 ON)
+  ENDIF(${GCC_VERSION} VERSION_GREATER "4.6.0")
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+IF(HAS_CXX11)
+  SUBDIRS(
+    widgetgallery
+  )
+ELSE(HAS_CXX11)
+  MESSAGE("Not building widget gallery; a C++11 compiler is required (gcc > 4.6 or MSVS 2012)")
+ENDIF(HAS_CXX11)
+
+

examples/CMakeLists.txt

@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = "Wt examples"
-PROJECT_NUMBER         = 3.2.3
+PROJECT_NUMBER         = 3.3.0
 OUTPUT_DIRECTORY       = ../doc/examples
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

examples/Doxyfile

@@ -8,7 +8,6 @@
 #include "PanelList.h"
 
 #include <iostream>
-#include <boost/lexical_cast.hpp>
 #include <boost/date_time/gregorian/greg_year.hpp>
 
 #include <Wt/WAbstractItemModel>
@@ -20,6 +19,7 @@
 #include <Wt/WEnvironment>
 #include <Wt/WIntValidator>
 #include <Wt/WLineEdit>
+#include <Wt/WLocale>
 #include <Wt/WPanel>
 #include <Wt/WPushButton>
 #include <Wt/WStandardItemModel>
@@ -44,7 +44,7 @@ namespace {
 
   bool getDouble(WLineEdit *edit, double& value) {
     try {
-      value = boost::lexical_cast<double>(edit->text().toUTF8());
+      value = WLocale::currentLocale().toDouble(edit->text());
       return true;
     } catch (...) {
       return false;
@@ -116,7 +116,7 @@ ChartConfig::ChartConfig(WCartesianChart *chart, WContainerWidget *parent)
   chartConfig->elementAt(row, 0)->addWidget(new WText("Width:"));
   chartWidthEdit_ = new WLineEdit(chartConfig->elementAt(row, 1));
   chartWidthEdit_
-    ->setText(boost::lexical_cast<std::string>(chart_->width().value()));
+    ->setText(WLocale::currentLocale().toString(chart_->width().value()));
   chartWidthEdit_->setValidator(sizeValidator);
   chartWidthEdit_->setMaxLength(4);
   connectSignals(chartWidthEdit_);
@@ -125,7 +125,7 @@ ChartConfig::ChartConfig(WCartesianChart *chart, WContainerWidget *parent)
   chartConfig->elementAt(row, 0)->addWidget(new WText("Height:"));
   chartHeightEdit_ = new WLineEdit(chartConfig->elementAt(row, 1));
   chartHeightEdit_
-    ->setText(boost::lexical_cast<std::string>(chart_->height().value()));
+    ->setText(WLocale::currentLocale().toString(chart_->height().value()));
   chartHeightEdit_->setValidator(sizeValidator);
   chartHeightEdit_->setMaxLength(4);
   connectSignals(chartHeightEdit_);
@@ -337,13 +337,15 @@ ChartConfig::ChartConfig(WCartesianChart *chart, WContainerWidget *parent)
     bool autoValues = axis.autoLimits() == (MinimumValue | MaximumValue);
 
     sc.minimumEdit = new WLineEdit(axisConfig->elementAt(j, 4));
-    sc.minimumEdit->setText(boost::lexical_cast<std::string>(axis.minimum()));
+    sc.minimumEdit->setText(WLocale::currentLocale()
+                            .toString(axis.minimum()));
     sc.minimumEdit->setValidator(anyNumberValidator);
     sc.minimumEdit->setEnabled(!autoValues);
     connectSignals(sc.minimumEdit);
 
     sc.maximumEdit = new WLineEdit(axisConfig->elementAt(j, 5));
-    sc.maximumEdit->setText(boost::lexical_cast<std::string>(axis.maximum()));
+    sc.maximumEdit->setText(WLocale::currentLocale()
+                            .toString(axis.maximum()));
     sc.maximumEdit->setValidator(anyNumberValidator);
     sc.maximumEdit->setEnabled(!autoValues);
     connectSignals(sc.maximumEdit);

examples/charts/ChartConfig.C

@@ -15,6 +15,11 @@ public:
   ChartsApplication(const WEnvironment& env)
     : WApplication(env)
   {
+    WLocale l;
+    l.setDecimalPoint(",");
+    l.setGroupSeparator(".");
+    setLocale(l);
+
     setTitle("Charts example");
 
     setCssTheme("polished");
@@ -25,7 +30,6 @@ public:
 
     new ChartsExample(root());
 
-
     /*
      * Set our style sheet last, so that it loaded after the ext stylesheets.
      */