X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWt.h;h=011f5980a8f1d4a014c56afb81c67e0a009f5441;hb=9e8c95c96acaea8851733d20090bf6de7eed1269;hp=299878eb13d0a3f4c2fb6c66e2c7a691420eb6a8;hpb=85be7d05390ee84a66308c17c740565456ce15d2;p=bbtk.git

diff --git a/kernel/src/bbtkWt.h b/kernel/src/bbtkWt.h
index 299878e..011f598 100644
--- a/kernel/src/bbtkWt.h
+++ b/kernel/src/bbtkWt.h
@@ -42,9 +42,22 @@
 // SIGNAL/SLOT MECHANISM 
 // FOR bbtk WINDOWS CREATION/DESTRUCTION OBSERVATION 
 // BBTKWXSIG
-#include <boost/signal.hpp>
+
+//EED 2020-03-17
+//#include <boost/signal.hpp>
+#include <boost/signals2/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>
@@ -71,30 +84,17 @@
 #include <Wt/WRadioButton>
 #include <Wt/Ext/Splitter>
 #include <Wt/WTabWidget>
-//typedef boost::signals::trackable SignalObserver;
-// \BBTKWXSIG
-//===========================================================================
+#include <Wt/WFileUpload>
+#include <Wt/WLength>
 
 
-//===========================================================================
-// 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
 
 
@@ -149,11 +149,17 @@ namespace bbtk
     // BBTKWXSIG
     // The keyword 'signals' is also a macro in qt
     //    typedef boost::signals::trackable SignalObserver;
-    typedef boost::signals::trackable SignalObserver;
-    typedef boost::signal<void ()>  Signal_type;
+
+//EED 2020-04-21
+//    typedef boost::signals::trackable SignalObserver;
+//    typedef boost::signal<void ()>  Signal_type;
+      
+    typedef boost::signals2::trackable SignalObserver;
+    typedef boost::signals2::signal<void ()>  Signal_type;
+
     typedef Signal_type::slot_function_type Slot_function_type;
     // \BBTKWXSIG
-
+		
     /*
     static void ResetCursor();
     static void BeginBusyCursor(); 
@@ -172,10 +178,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();
@@ -199,6 +208,9 @@ namespace bbtk
   //==================================================================
   
 #ifdef USE_WT
+
+
+	static std::string jScript;
   //==================================================================
   /// Conversion std::string to wxString 
   inline Wt::WString std2wt(const std::string& s)