several fixes for recent boost libs, adopt boost::random_device by default, and WPopupMenu API improvements

Author: Koen Deforche

CMakeLists.txt

@@ -95,6 +95,7 @@ OPTION(ENABLE_POSTGRES "Build PostgreSQL backend for Wt::Dbo" ON)
 OPTION(ENABLE_QT4 "Build Qt4 interworking library (libwtwithqt" ON)
 OPTION(WT_NO_STD_LOCALE "Build Wt to run on a system without std::locale support" OFF)
 OPTION(WT_NO_STD_WSTRING "Build Wt to run on a system without std::wstring support" OFF)
+OPTION(WT_NO_BOOST_RANDOM "For compatibility with some really old boost versions. Do not enable for boost > 1.45" OFF)
 
 IF(APPLE)
   OPTION(USE_BOOST_FRAMEWORK "Uses a Boost framework" OFF)

Changelog

@@ -1,3 +1,7 @@
+25-07-2011:
+	* WPopupMenu, WPopupMenuItem: improved triggered() signal API and
+	added setSelectable() signals
+
 18-07-2011:
 	* WMenuItem: fix takeContents() (#897)
 

WConfig.h.in

@@ -30,6 +30,7 @@
 #cmakedefine WT_HAS_WPDFIMAGE
 
 #cmakedefine WT_NO_BOOST_INTRUSIVE
+#cmakedefine WT_NO_BOOST_RANDOM
 #cmakedefine WT_NO_STD_LOCALE
 #cmakedefine WT_NO_STD_WSTRING
 

cmake/WtFindBoost-cmake.txt

@@ -52,16 +52,31 @@ ENDIF(WIN32)
 
 SET(Boost_DEBUG ON)
 
-FIND_PACKAGE(Boost 1.35
-  COMPONENTS
-    date_time
-    regex
-    program_options
-    signals
-    system
-    filesystem
-    thread
-  REQUIRED)
+IF(WT_NO_BOOST_RANDOM)
+  FIND_PACKAGE(Boost 1.35
+    COMPONENTS
+      date_time
+      regex
+      program_options
+      signals
+      system
+      filesystem
+      thread
+    REQUIRED)
+ELSE(WT_NO_BOOST_RANDOM)
+  FIND_PACKAGE(Boost 1.35
+    COMPONENTS
+      date_time
+      regex
+      program_options
+      random
+      signals
+      system
+      filesystem
+      thread
+    REQUIRED)
+ENDIF(WT_NO_BOOST_RANDOM)
+
 IF (Boost_FOUND)
   # Translate variables from official cmake names to internally used names
   SET(BOOST_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
@@ -73,6 +88,7 @@ IF (Boost_FOUND)
   SET(BOOST_SIGNALS_LIB ${Boost_SIGNALS_LIBRARY})
   SET(BOOST_SYSTEM_LIB ${Boost_SYSTEM_LIBRARY})
   SET(BOOST_THREAD_LIB ${Boost_THREAD_LIBRARY})
+  SET(BOOST_RANDOM_LIB ${Boost_RANDOM_LIBRARY})
 
   SET(BOOST_WT_MT_FOUND TRUE)
   SET(BOOST_WT_FOUND TRUE)
@@ -86,6 +102,7 @@ IF (Boost_FOUND)
   ELSE(MSVC)
     SET(BOOST_WT_LIBRARIES
         ${Boost_THREAD_LIBRARY}
+        ${Boost_RANDOM_LIBRARY}
         ${Boost_REGEX_LIBRARY}
         ${Boost_SIGNALS_LIBRARY}
         ${Boost_SYSTEM_LIBRARY}

cmake/WtFindBoost-vintage.txt

@@ -10,6 +10,7 @@
 # Separate compiled boost libraries are also discovered:
 # - BOOST_DT_LIB
 # - BOOST_FS_LIB
+# - BOOST_RANDOM_LIB
 # - BOOST_REGEX_LIB
 # - BOOST_PO_LIB
 # - BOOST_SIGNALS_LIB
@@ -51,6 +52,11 @@ ELSE(MSVC)
 
     SET(BOOST_THREAD_LIB ${BOOST_FRAMEWORK_LIB})
     SET(BOOST_REGEX_LIB ${BOOST_FRAMEWORK_LIB})
+    IF(NOT WT_NO_BOOST_RANDOM)
+      SET(BOOST_RANDOM_LIB ${BOOST_FRAMEWORK_LIB})
+    ELSE(NOT WT_NO_BOOST_RANDOM)
+      SET(BOOST_RANDOM_LIB "")
+    ENDIF(NOT WT_NO_BOOST_RANDOM)
     SET(BOOST_PO_LIB ${BOOST_FRAMEWORK_LIB})
     SET(BOOST_DT_LIB ${BOOST_FRAMEWORK_LIB})
     SET(BOOST_SIGNALS_LIB ${BOOST_FRAMEWORK_LIB})
@@ -75,6 +81,26 @@ ELSE(MSVC)
     NO_DEFAULT_PATH
  )
 
+  IF(NOT WT_NO_BOOST_RANDOM)
+    FIND_LIBRARY(BOOST_RANDOM_LIB
+      NAMES
+        boost_random-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
+        boost_random-${BOOST_COMPILER}-mt-${BOOST_VERSION}
+        boost_random-${BOOST_COMPILER}-mt
+        boost_random-${BOOST_VERSION}
+        boost_random-mt
+        boost_random-${BOOST_COMPILER}-${BOOST_VERSION}
+        boost_random-${BOOST_COMPILER}
+        boost_random-${BOOST_VERSION}
+        boost_random
+      PATHS
+        ${BOOST_LIB_DIRS}
+      NO_DEFAULT_PATH
+    )
+  ELSE(NOT WT_NO_BOOST_RANDOM)
+    SET(BOOST_RANDOM_LIB "")
+  ENDIF(NOT WT_NO_BOOST_RANDOM)
+
   FIND_LIBRARY(BOOST_REGEX_LIB
     NAMES
       boost_regex-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
@@ -208,6 +234,7 @@ IF(BOOST_INCLUDE_DIRS)
   IF(NOT BOOST_WT_FOUND
      AND MULTI_THREADED
      AND BOOST_THREAD_LIB
+     AND (WT_NO_BOOST_RANDOM OR BOOST_RANDOM_LIB)
      AND BOOST_REGEX_LIB
      AND BOOST_SIGNALS_LIB
      AND BOOST_SYSTEM_LIB
@@ -218,12 +245,14 @@ IF(BOOST_INCLUDE_DIRS)
 
     SET(BOOST_WT_LIBRARIES
         ${BOOST_THREAD_LIB}
+        ${BOOST_RANDOM_LIB}
         ${BOOST_REGEX_LIB}
         ${BOOST_SIGNALS_LIB}
         ${BOOST_SYSTEM_LIB}
         ${BOOST_DT_LIB})
 
     SET(BOOST_WT_THREAD_LIBRARY  ${BOOST_THREAD_LIB})
+    SET(BOOST_WT_RANDOM_LIBRARY   ${BOOST_RANDOM_LIB})
     SET(BOOST_WT_REGEX_LIBRARY   ${BOOST_REGEX_LIB})
     SET(BOOST_WT_SIGNALS_LIBRARY ${BOOST_SIGNALS_LIB})
     SET(BOOST_WT_SYSTEM_LIBRARY  ${BOOST_SYSTEM_LIB})
@@ -232,12 +261,14 @@ IF(BOOST_INCLUDE_DIRS)
   ENDIF(NOT BOOST_WT_FOUND
      AND MULTI_THREADED
      AND BOOST_THREAD_LIB
+     AND (WT_NO_BOOST_RANDOM OR BOOST_RANDOM_LIB)
      AND BOOST_REGEX_LIB
      AND BOOST_SIGNALS_LIB
      AND BOOST_SYSTEM_LIB
      AND BOOST_DT_LIB)
 
   IF(NOT BOOST_WT_FOUND
+     AND (WT_NO_BOOST_RANDOM OR BOOST_RANDOM_LIB)
      AND BOOST_REGEX_LIB
      AND BOOST_SIGNALS_LIB
      AND BOOST_SYSTEM_LIB
@@ -248,17 +279,20 @@ IF(BOOST_INCLUDE_DIRS)
     SET(BOOST_WT_FOUND TRUE)
 
     SET(BOOST_WT_LIBRARIES
+        ${BOOST_RANDOM_LIB}
         ${BOOST_REGEX_LIB}
         ${BOOST_SIGNALS_LIB}
 	${BOOST_SYSTEM_LIB}
         ${BOOST_DT_LIB})
 
+    SET(BOOST_WT_RANDOM_LIBRARY  ${BOOST_RANDOM_LIB})
     SET(BOOST_WT_REGEX_LIBRARY   ${BOOST_REGEX_LIB})
     SET(BOOST_WT_SIGNALS_LIBRARY ${BOOST_SIGNALS_LIB})
     SET(BOOST_WT_SYSTEM_LIBRARY  ${BOOST_SYSTEM_LIB})
     SET(BOOST_WT_DT_LIBRARY      ${BOOST_DT_LIB})
 
   ENDIF(NOT BOOST_WT_FOUND
+     AND (WT_NO_BOOST_RANDOM OR BOOST_RANDOM_LIB)
      AND BOOST_REGEX_LIB
      AND BOOST_SIGNALS_LIB
      AND BOOST_SYSTEM_LIB

src/Wt/WPopupMenu

@@ -289,11 +289,21 @@ public:
    */
   Signal<>& aboutToHide() { return aboutToHide_; }
 
+  /*! \brief %Signal emitted when an item is activated.
+   *
+   * Passes the activated item as argument. This signal is only emitted
+   * for the toplevel menu.
+   *
+   * \sa WPopupMenuItem::triggered()
+   */
+  Signal<WPopupMenuItem *>& triggered() { return triggered_; }
+
 private:
   WTemplate      *impl_;
   WPopupMenuItem *parentItem_, *result_;
 
   Signal<> aboutToHide_;
+  Signal<WPopupMenuItem *> triggered_;
 
   boost::signals::connection globalClickConnection_, globalEscapeConnection_;
   bool                       recursiveEventLoop_;

src/Wt/WPopupMenu.C

@@ -23,6 +23,7 @@ WPopupMenu::WPopupMenu()
     parentItem_(0),
     result_(0),
     aboutToHide_(this),
+    triggered_(this),
     recursiveEventLoop_(false)
 {
   const char *TEMPLATE =
@@ -143,6 +144,8 @@ void WPopupMenu::done(WPopupMenuItem *result)
 
   recursiveEventLoop_ = false;
 
+  triggered_.emit(result_);
+
   aboutToHide_.emit();
 }
 

src/Wt/WPopupMenuItem

@@ -82,7 +82,7 @@ public:
    *
    * \sa setChecked(), isChecked()
    */
-  void setCheckable(bool how);
+  void setCheckable(bool checkable);
 
   /*! \brief Returns whether the item is checkable.
    *
@@ -111,7 +111,7 @@ public:
    *
    * \sa setCheckable(bool), isCheckable()
    */
-  void setChecked(bool how);
+  void setChecked(bool checked);
 
   /*! \brief Returns the checked state.
    *
@@ -121,6 +121,25 @@ public:
    */
   bool isChecked() const;
 
+  /*! \brief Sets whether the menu item can be selected.
+   *
+   * Only a menu item that can be selected can be the result of a
+   * popup menu selection.
+   *
+   * The default value is \c true for a normal menu item, and \c false
+   * for a menu item that has a submenu.
+   *
+   * An item that is selectable but is disabled can still not be
+   * selected.
+   */
+  void setSelectable(bool selectable);
+
+  /*! \brief Returns whether the menu item can be selected.
+   *
+   * \sa setSelectable()
+   */
+  bool isSelectable() const { return selectable_; }
+
   /*! \brief Sets associated additional data with the item.
    */
   void setData(void *data) { data_ = data; }
@@ -132,12 +151,19 @@ public:
   WCheckBox *checkBox() const { return checkBox_; }
 
   /*! \brief %Signal emitted when an item is activated.
+   *
+   * Returns this item as argument.
+   *
+   * \sa WPopupMenu::triggered()
    */
-  Signal<>& triggered() { return triggered_; }
+  Signal<WPopupMenuItem *>& triggered() { return triggered_; }
 
   virtual void load();
   virtual void setDisabled(bool disabled);
 
+protected:
+  virtual void render(WFlags<RenderFlag> flags);
+
 private:
   // Constructs a separator
   WPopupMenuItem(bool);
@@ -147,9 +173,9 @@ private:
   WCheckBox        *checkBox_;
   WPopupMenu       *subMenu_;
   void             *data_;
-  bool              separator_;
+  bool              separator_, selectable_;
 
-  Signal<>          triggered_;
+  Signal<WPopupMenuItem *> triggered_;
 
   void create();
   void renderOver();