From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Wed, 7 Oct 2015 05:58:01 +0000 (+0200)
Subject: #249 8BBTK Feature New Normal  -  wt-version kernel
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8835a458dc8c2860b184902cafac365bdd02e224;p=bbtk.git

#249 8BBTK Feature New Normal  -  wt-version kernel
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ced062..9514401 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,8 +83,14 @@ ADD_SUBDIRECTORY(packages)
 # The samples
 
 
-#----JFGA ---- Por default.
-SET(USE_WT OFF)
+#----JFGA EED---- 06/10/2015
+OPTION(USE_WT "Build bbtk web" OFF)
+
+#IF(CREA_BUILD_BBTK_WEB)
+#	SET(USE_WT ON)
+#ELSE(CREA_BUILD_BBTK_WEB)
+#	SET(USE_WT OFF)
+#ENDIF(CREA_BUILD_BBTK_WEB)
 
 
 # WARNING
diff --git a/kernel/appli/bbi/CMakeLists.txt b/kernel/appli/bbi/CMakeLists.txt
index bfe73d5..a8a2ddb 100644
--- a/kernel/appli/bbi/CMakeLists.txt
+++ b/kernel/appli/bbi/CMakeLists.txt
@@ -46,13 +46,13 @@ ENDIF(BBTK_USE_WXWIDGETS AND WIN32)
 TARGET_LINK_LIBRARIES(bbi bbtk)
 INSTALL_TARGETS(/bin/ bbi)
 
-SET(SOURCES
-  bbiWeb
-  )
 
-ADD_EXECUTABLE(bbiWeb.wt MACOSX_BUNDLE ${SOURCES})  
-TARGET_LINK_LIBRARIES(bbiWeb.wt bbtk)
-INSTALL_TARGETS(/bin/ bbiWeb.wt)
+IF(USE_WT)
+	SET(SOURCES bbiWeb )
+	ADD_EXECUTABLE(bbiWeb.wt MACOSX_BUNDLE ${SOURCES})  
+	TARGET_LINK_LIBRARIES(bbiWeb.wt bbtk)
+	INSTALL_TARGETS(/bin/ bbiWeb.wt)
+ENDIF(USE_WT)
 
 
 
diff --git a/kernel/src/bbtkWt.h b/kernel/src/bbtkWt.h
index 0828d0b..f1fcd5e 100644
--- a/kernel/src/bbtkWt.h
+++ b/kernel/src/bbtkWt.h
@@ -45,6 +45,15 @@
 #include <boost/signal.hpp>
 #include <boost/bind.hpp>
 
+//typedef boost::signals::trackable SignalObserver;
+// \BBTKWXSIG
+//===========================================================================
+
+
+//===========================================================================
+// Wt headers
+// DEFINIR LOS HEADERS Wt que se necesitan  *-*-*-*-*-*-*-*-*-*
+#ifdef USE_WT
 
 //TODO Include libs in the CMake escription
 #include <Wt/WApplication>
@@ -74,30 +83,14 @@
 #include <Wt/WFileUpload>
 #include <Wt/WLength>
 
-//typedef boost::signals::trackable SignalObserver;
-// \BBTKWXSIG
-//===========================================================================
-
 
-//===========================================================================
-// Qt headers
-// DEFINIR LOS HEADERS Wt que se necesitan  *-*-*-*-*-*-*-*-*-*
-/*
-#ifdef USE_WT
-#include "qwidget.h"
-// EO Qt headers
+#else //USE_WT
 
-#else //USE_QT
+#endif // EO USE_WT
 
-// define QWidget
-typedef void QWidget;
-typedef void QBusyCursor;
 
-#endif // EO USE_WXWIDGETS
 
-//-*-*-*-* JFGA 
 
-*/
 #ifdef USE_WT
 
 
@@ -175,10 +168,13 @@ namespace bbtk
 
 
     static void ProcessPendingEvents();
+
+#ifdef USE_WT
     /// Sets the parent of all bbtk windows
     static void SetTopWindow(Wt::WContainerWidget*);
     /// Returns the parent of all bbtk windows 
     static Wt::WContainerWidget* GetTopWindow();
+#endif // EO USE_WT
 
     
     static void IncNbWindowsAlive();