#2536 BBTK Feature New Normal wt-version Package

[bbtk.git] / kernel / src / bbtkWtBlackBox.cxx

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index a8bec6700c043ec4a18f371bc41b04be9edd83f7..a5925d48a95cae3c3e3efb79b7b1a3aba041df73 100644 (file)
--- a/kernel/src/bbtkWtBlackBox.cxx
+++ b/kernel/src/bbtkWtBlackBox.cxx
@@ -141,15 +141,18 @@ namespace bbtk
 
                //this->require("http://get.goXTK.com/xtk.js");
                //this->useStyleSheet("css/demo.css");
+
+
+       //this->require("http://get.goXTK.com/xtk.js");
+       this->require( "resourcesXTK/xtk.js" );
+
                
        //      this->require("http://get.goXTK.com/xtk_edge.js");
 //     this->require("http://get.goXTK.com/xtk_xdat.gui.js");
-       this->require("xtk_xdat.gui.js");
+       this->require( "resourcesXTK/xtk_xdat.gui.js" );
 
-       //this->require("http://get.goXTK.com/xtk.js");
-       this->require("xtk.js");
 
-  this->useStyleSheet("styleWT.css"); 
+  this->useStyleSheet("resourcesXTK/styleWT.css"); 
   
 
        //      std::cout<<"Cargado------------           "<<loadedJS<<std::endl;
@@ -296,21 +299,18 @@ namespace bbtk
        //std::string WtBlackBox::wtServerData::docRoot = "/usr/local/share/wtResources";
   //std::string WtBlackBox::wtServerData::port    = "8081";
 
-       std::string WtBlackBox::wtServerData::docRoot = "<void>";
-       std::string WtBlackBox::wtServerData::port    = "<void>";
-  std::string WtBlackBox::wtServerData::address = "0.0.0.0";
-       
+       std::string WtBlackBox::wtServerData::docRoot   = "<void>";
+       std::string WtBlackBox::wtServerData::port      = "<void>";
+  std::string WtBlackBox::wtServerData::address        = "0.0.0.0";
+  int WtBlackBox::wtServerData::argc                   = 0;
+  char **WtBlackBox::wtServerData::argv                = NULL;
+
   //=========================================================================
   //=========================================================================
   void WtBlackBox::bbUserSetDefaultValues()
   {
     bbtkBlackBoxDebugMessage("widget",5,"WtBlackBox::bbUserSetDefaultValues()"<<std::endl);
     bbmWindow = 0;
-  /*  WtBlackBox::serData.docRoot = "/home/gonzalez/Documents/pruebaResources";
-    WtBlackBox::serData.address = "0.0.0.0";
-    WtBlackBox::serData.port    = "8080";*/
-    
-
   }
   //=========================================================================
 
@@ -367,21 +367,34 @@ namespace bbtk
                //char  *argv[7] =  {"./WtTest","--docroot","/home/gonzalez/Documents/pruebaResources","--http-address","0.0.0.0","--http-port","8080"};
                //int argc = 7;
                
-               
-                       char  *argv[7] =  {"./WtTest","--docroot",(char*)WtBlackBox::wtServerData::docRoot.c_str(),"--http-address",(char*)WtBlackBox::wtServerData::address.c_str(),"--http-port",(char*)WtBlackBox::wtServerData::port.c_str()};
-               int argc = 7;
-               
+/*             
+                       char  *argv[7] =  {"./WtTest"
+,"--docroot",(char*)WtBlackBox::wtServerData::docRoot.c_str()
+,"--http-address",(char*)WtBlackBox::wtServerData::address.c_str()
+,"--http-port",(char*)WtBlackBox::wtServerData::port.c_str()
+};
+               int argc = 3;
                std::cout<<" ---  PUERTO  :"<<WtBlackBox::wtServerData::port<<std::endl;
-               
+*/
+
+/*             
+char  *argv[2] =  {"./bbiWeb.wt","client"};
+int argc=2;
+*/
+
+
        /*      if(Wt::WServer::instance()->isRunning())
                {
                        std::cout<<"Checking the existence of a Server deployed  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
                        Wt::WServer::instance()->stop();
                }
        */
-               std::cout<<"Deploying Server -- Definition of server parameters by default  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
-               Wt::WRun(argc,argv,&createApplication); 
-       }
+               std::cout<<"EED WtBlackBox::bbCreateFrameWindow  Deploying Server -- Definition of server parameters by default  -DELETE THIS MESSAGE bbtkWTBlackBox.cxx"<<std::endl;
+//             Wt::WRun(argc,argv,&createApplication); 
+               Wt::WRun(WtBlackBox::wtServerData::argc,
+                         WtBlackBox::wtServerData::argv,
+                         &createApplication);  
+   }
 
   //==================================================================