see Changelog

Author: Koen Deforche

CMakeLists.txt

@@ -54,6 +54,7 @@ IF(WIN32)
   SET(GD_DIR ${USERLIB_ROOT} CACHE PATH "Search path for libgd")
   OPTION(BOOST_DYNAMIC "Link to boost DLLs (OFF means static link)" OFF)
   OPTION(MXML_SUPPLIED "Force use of supplied mxml over installed mxml." ON)
+  OPTION(DEBUG "Support for debugging, must be enabled also in wt_config.xml" OFF)
 
 ELSE(WIN32)
 
@@ -69,7 +70,7 @@ ELSE(WIN32)
   SET(BOOST_VERSION "1_35" CACHE STRING "Boost libraries version signature")
   SET(GD_DIR "/usr/lib" CACHE PATH "Search path for libgd2")
   OPTION(MXML_SUPPLIED "Force use of supplied mxml over installed mxml." ON)
-
+  OPTION(DEBUG "Support for debugging, must be enabled also in wt_config.xml" OFF)
 ENDIF(WIN32)
 
 MARK_AS_ADVANCED( CONFIGDIR )
@@ -109,6 +110,12 @@ IF(NOT CMAKE_BUILD_TYPE)
       FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
+IF(DEBUG)
+  SET(WT_DEBUG_ENABLED 1)
+ELSE(DEBUG)
+  SET(WT_DEBUG_ENABLED 0)
+ENDIF(DEBUG)
+
 # Compile time constants & make sure our build finds it
 FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Wt)
 SET(WCONFIG_H_PATH ${CMAKE_CURRENT_BINARY_DIR}/Wt/WConfig.h)
@@ -141,4 +148,4 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/resources DESTINATION
 
 IF(NOT EXISTS ${CONFIGDIR}/wt_config.xml)
   INSTALL(FILES ${PROJECT_SOURCE_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
-ENDIF (NOT EXISTS ${CONFIGDIR}/wt_config.xml)
+ENDIF (NOT EXISTS ${CONFIGDIR}/wt_config.xml)

Changelog

@@ -1,3 +1,17 @@
+17-07-2009:
+	* WServer, WGlobal: move WServer::Application and WServer::WidgetSet to
+	global enum
+
+	* WAbstractToggleButton.C: put label inside a <span> so that it works
+	as expected when used within a layout manager
+
+	* Test/WTestEnvironment: test environment, for instantiating
+	WApplication instances usable for (unit) tests
+
+06-07-2009:
+	* WGridLayout, WBoxLayout, WTabWidget: better documentation that
+	discusses how to set contents with 100% height.
+
 29-06-2009:
 	* JSlot: fix exec() call as suggested by Adrian Sutherland
 

Doxyfile

@@ -1137,7 +1137,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = DOXYGEN_ONLY WT_USTRING=WString WT_BOSTREAM=std::ostream WT_ARRAY=
+PREDEFINED             = DOXYGEN_ONLY WT_USTRING=WString WT_LOCALE=std::string WT_BOSTREAM=std::ostream WT_ARRAY=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

WConfig.h.in

@@ -24,5 +24,15 @@
 #cmakedefine WTHTTP_STATIC
 #cmakedefine WT_EXT_STATIC
 
+#if ${WT_DEBUG_ENABLED}
+#ifndef WT_TARGET_JAVA
+  #define WT_DEBUG(statement) do { if (Wt::WApplication::instance()->debug()) statement; } while(0)
+#else
+  #define WT_DEBUG(statement)
+#endif
+#else
+  #define WT_DEBUG(statement)
+#endif
+
 #endif
 

examples/extkitchen/ExtKitchenApplication.C

@@ -109,7 +109,7 @@ WWidget *ExtKitchenApplication::createExampleTree()
   rootNode->expand();
   rootNode->setLoadPolicy(WTreeNode::NextLevelLoading);
 
-  createExampleNode("Menu & ToolBar", rootNode,
+  createExampleNode("Menu and ToolBar", rootNode,
 		    &ExtKitchenApplication::menuAndToolBarExample);
   createExampleNode("Form widgets", rootNode,
 		    &ExtKitchenApplication::formWidgetsExample);

examples/hangman/HangmanDb.C

@@ -55,7 +55,7 @@ bool HangmanDb::validLogin(const std::wstring &user, const std::wstring &pass)
       q << "select user,pass from users where "
 	<< "user='" << Wt::toUTF8(user)
 	<< "' and pass=MD5('" << Wt::toUTF8(pass) << "')";
-      Result res = q.store();
+      StoreQueryResult res = q.store();
       return res.size() > 0;
    } catch(Exception &e) {
       std::cerr << "Database exception!\n";
@@ -72,7 +72,7 @@ void HangmanDb::addToScore(const std::wstring &user, int delta)
       q << "update users set score=(score+" << delta << "), "
 	<< "numgames=(numgames+1), lastseen=now() "
 	<< "where user='" << Wt::toUTF8(user) << "'";
-      Result res = q.store();
+      StoreQueryResult res = q.store();
    } catch(Exception &e) {
       std::cerr << "Database exception!\n";
       std::cerr << e.what() << std::endl;
@@ -88,7 +88,7 @@ std::vector<HangmanDb::Score> HangmanDb::getHighScores(int top)
       q << "select user, numgames, score, lastseen from users "
 	<< "order by score desc "
 	<< "limit " << top;
-      Result res = q.store();
+      StoreQueryResult res = q.store();
 
       for(unsigned int i = 0; i < res.size(); ++i) {
 	 struct Score s;
@@ -113,7 +113,7 @@ HangmanDb::Score HangmanDb::getUserPosition(const std::wstring &user)
       Query q = con.query();
       q << "select user, numgames, score, lastseen from users "
 	<< "order by score desc";
-      Result res = q.store();
+      StoreQueryResult res = q.store();
 
       // There MUST be a better way to do this...
       for(unsigned int i = 0; i < res.size(); ++i) {

examples/hello-widgetset/hello.C

@@ -128,11 +128,11 @@ int main(int argc, char **argv)
   // The following is the default entry point. It configures a
   // standalone Wt application at the deploy path configured in the
   // server configuration.
-  server.addEntryPoint(WServer::Application, createApplication);
+  server.addEntryPoint(Application, createApplication);
 
   // The following adds an entry point for a widget set. A widget set
   // must be loaded as a JavaScript from an HTML page.
-  server.addEntryPoint(WServer::WidgetSet, createWidgetSet, "hello.wtjs");
+  server.addEntryPoint(WidgetSet, createWidgetSet, "/hello.wtjs");
 
   // Start the server (in the background if there is threading support)
   // and wait for a shutdown signal (e.g. Ctrl C, SIGKILL)

examples/wt-homepage/main.C

@@ -14,12 +14,11 @@ int main(int argc, char **argv)
 
   server.setServerConfiguration(argc, argv, WTHTTP_CONFIGURATION);
 
-  server.addEntryPoint(WServer::Application, createWtHomeApplication,
+  server.addEntryPoint(Application, createWtHomeApplication,
 		       "", "/css/wt/favicon.ico");
 
   if (server.start()) {
     WServer::waitForShutdown();
     server.stop();
   }
 }
-

src/CMakeLists.txt

@@ -198,6 +198,7 @@ Wt/Http/Client.C
 Wt/Http/Request.C
 Wt/Http/Response.C
 Wt/Http/ResponseContinuation.C
+Wt/Test/WTestEnvironment.C
 web/CgiParser.C
 web/Configuration.C
 web/DomElement.C

src/Wt/CMakeLists.txt

@@ -1,4 +1,4 @@
-SUBDIRS(Ext Chart Http)
+SUBDIRS(Ext Chart Http Test)
 INSTALL_FILES(/include/Wt "^W.*[^C~]$")
 #INSTALL(
 #  FILES