#3299 BBTK Bug New Normal wt4

diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx
index 0c2a7a12f6751428e461385c2f4b4897b52e9d4d..0a225548b0e31842e6bc2d869b009f01dae9ee0c 100644 (file)
--- a/kernel/src/bbtkWidgetBlackBox.txx
+++ b/kernel/src/bbtkWidgetBlackBox.txx
@@ -195,23 +195,21 @@ namespace bbtk
     // If input is connected 
     BlackBoxInputConnector* c = bbGetInputConnectorMap().find(in)->second ;
     if ( c->IsConnected() )                    
-      {
-       // Get black box from 
-       BlackBox::Pointer from = 
-         c->GetConnection()->GetBlackBoxFrom();
-       // Cast it into a WidgetBlackBox
-       typename WidgetBlackBox<T>::Pointer wfrom 
-         = boost::dynamic_pointer_cast<WidgetBlackBox<T> >(from);
-       // If the black box from construction is not done yet : do it
-        // If not constructed do it 
-       wfrom->bbInitializeProcessing();
-       // Call bbUserCreateWidget
-       wfrom->bbUserCreateWidget(parent);
-       // Get the widget created
-       w = wfrom->bbGetOutputWidget();
-       // Insert the box into the NestedWidgetBoxes list
-       bbmNestedWidgetBoxes.push_back(from);
-      }
+    {
+               // Get black box from 
+               BlackBox::Pointer from = c->GetConnection()->GetBlackBoxFrom();
+               // Cast it into a WidgetBlackBox
+               typename WidgetBlackBox<T>::Pointer wfrom  = boost::dynamic_pointer_cast<WidgetBlackBox<T> >(from);
+               // If the black box from construction is not done yet : do it
+                // If not constructed do it 
+               wfrom->bbInitializeProcessing();
+               // Call bbUserCreateWidget
+               wfrom->bbUserCreateWidget(parent);
+               // Get the widget created
+               w = wfrom->bbGetOutputWidget();
+               // Insert the box into the NestedWidgetBoxes list
+               bbmNestedWidgetBoxes.push_back(from);
+    } // if IsConnected
     return w;
   }
   //==================================================================

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index 01a91bec01643466e5a9844ac058a18cfb5980ca..70d8ff0911c539eb820c8178e7dfa460e5e95cca 100644 (file)
--- a/kernel/src/bbtkWtBlackBox.cxx
+++ b/kernel/src/bbtkWtBlackBox.cxx
@@ -200,7 +200,7 @@ printf("EED (WT) WtWFrame  warnning 2019 B  parent ?? \n");
 printf("EED (WT) createApplication  warnning 2019 \n");
 //EED2019-08-20 
 //                     return new WtWFrame(env);                       
-                       std::make_unique<WtWFrame>(env);
+                       return std::make_unique<WtWFrame>(env);
 
        }
 
@@ -317,9 +317,8 @@ printf("EED (WT) createApplication  warnning 2019 \n");
   //=========================================================================
   void WtBlackBox::bbUserInitializeProcessing()
   {
-
   }
-  //================================================================http://intranet-if.insa-lyon.fr/temps/5IF39.html==    
+  //==================================================================    
 
   //=========================================================================
   void WtBlackBox::bbUserFinalizeProcessing()
@@ -335,7 +334,7 @@ printf("EED (WT) createApplication  warnning 2019 \n");
   void WtBlackBox::bbCreateDialogWindow()
   {
          bbtkBlackBoxDebugMessage("widget",3,
-                    "==> WtBlackBox::bbCreateDialogWindow() - No Dialog must be created, it is a web app"
+                        "==> WtBlackBox::bbCreateDialogWindow() - No Dialog must be created, it is a web app"
                     <<std::endl);
 
   } 
@@ -347,12 +346,10 @@ printf("EED (WT) createApplication  warnning 2019 \n");
   /// Callback for creating a Frame window 
        void WtBlackBox::bbCreateFrameWindow()
        {
-
                bbtkBlackBoxDebugMessage("widget",3,
                        "==> WtBlackBox::bbCreateFrameWindow() - parent = "
                        <<WWt::GetTopWindow()
                        <<std::endl);
-
                //Setting necessary data for Wt server deployment
                myWtData.parent = WWt::GetTopWindow();
                myWtData.b      = GetThisPointer<WtBlackBox>();
@@ -377,7 +374,6 @@ 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;
@@ -385,17 +381,11 @@ int argc=2;
                }
        */
 
-
                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);   
-
-
+               Wt::WRun(WtBlackBox::wtServerData::argc,WtBlackBox::wtServerData::argv, &createApplication);
    }
 
   //==================================================================    
@@ -405,9 +395,9 @@ int argc=2;
   {
     bbtkBlackBoxDebugMessage("widget",9,"==> WtBlackBox::bbSetWindow("<<w<<")"<<std::endl);
     if ((bbmWindow != 0)&&(w!=0)) 
-      { 
-       std::cout << "ERRRRRRRROOOOR"<<std::endl; 
-      }
+    { 
+               std::cout << "ERRRRRRRROOOOR"<<std::endl; 
+    }
     bbmWindow = w;
   }
 
@@ -419,28 +409,22 @@ int argc=2;
   void WtBlackBox::bbShowWindow()
   {
     if ((bbmWindow) && (!bbIsShown()))
-      {
-       bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbShowWindow()"
-                        <<std::endl);
-       if (bbGetInputWinDialog()) 
-         {
-         //  ((WxDialog*)bbmWindow)->ShowModal();
-         }
-       else
-         {
-               // There is not such a thing like show becouse it is a webapp
-          // bbGetWindow()->Show();
-         //  WWt::CreateWtAppIfNeeded();
-
-
-               Wt::WRun(WtBlackBox::wtServerData::argc,
-                         WtBlackBox::wtServerData::argv,
-                         &createApplication);  
-
-
-           bbSetShown(true);
-         } 
-      }
+    {
+               bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbShowWindow()"
+                                <<std::endl);
+               if (bbGetInputWinDialog()) 
+               {
+                 //  ((WxDialog*)bbmWindow)->ShowModal();
+               } else {
+                       // There is not such a thing like show becouse it is a webapp
+                  // bbGetWindow()->Show();
+                 //  WWt::CreateWtAppIfNeeded();
+                       Wt::WRun(WtBlackBox::wtServerData::argc,
+                                    WtBlackBox::wtServerData::argv,
+                                    &createApplication);       
+                       bbSetShown(true);
+               }  // if Dialog
+    } // if Window Show
   }
   //==================================================================    
 
@@ -449,18 +433,17 @@ int argc=2;
   {
     bbtkBlackBoxDebugMessage("widget",3,"==> WtBlackBox::bbDestroyWindow("<<bbmWindow<<")"<<std::endl);
     if (bbGetWindow()!=NULL) 
-      {
-       //       wxWindow* w = bbGetWindow();
-       //bbSetWindow(0);
-       // WE SHOULD DESTROY THE WINDOW WITH THE Close METHOD
-       // HOWEVER I
-       //w->Close(true);
-       //
-       delete bbGetWindow();
-       bbSetShown(false);
-      }
+    {
+               //       wxWindow* w = bbGetWindow();
+               //bbSetWindow(0);
+               // WE SHOULD DESTROY THE WINDOW WITH THE Close METHOD
+               // HOWEVER I
+               //w->Close(true);
+               //
+               delete bbGetWindow();
+               bbSetShown(false);
+    }
     bbtkBlackBoxDebugMessage("widget",3,"<== WtBlackBox::bbDestroyWindow("<<bbmWindow<<")"<<std::endl);
-
   }
 
 

diff --git a/kernel/src/bbtkWtBlackBox.h b/kernel/src/bbtkWtBlackBox.h
index 4725a0dfeac48efd3fdf351d87a4921c76edf4fe..974876b0c75a3692eb5550835e80829f1cf6b6a7 100644 (file)
--- a/kernel/src/bbtkWtBlackBox.h
+++ b/kernel/src/bbtkWtBlackBox.h
@@ -50,56 +50,41 @@
  * \brief 
  */
 
-
 #ifdef USE_WT
 
-
-
 #ifndef __bbtkWtBlackBox_h__
 #define __bbtkWtBlackBox_h__
 
-
-
 #include "bbtkWidgetBlackBox.h"
 #include "bbtkWt.h"
 
-
 namespace bbtk
 {
 
- 
-
   //==================================================================
   /// Widget black boxes
 //EED 10/06/2009 /*BBTK_EXPORT*/
   class BBTK_EXPORT WtBlackBox : public bbtk::WidgetBlackBox<Wt::WContainerWidget>
   { 
-  
- 
 
-  
-  
-  
   public:
     BBTK_BLACK_BOX_INTERFACE(WtBlackBox,bbtk::WidgetBlackBox<Wt::WContainerWidget>);
-    
-         
+      
     //  protected:
-    
   public:
-  
      struct wtServerData
           {
-             /*std::string docRoot;
-             std::string port;
-             std::string address;
+            /*
+                       std::string docRoot;
+               std::string port;
+               std::string address;
            */
-             static std::string docRoot  ;
-             static std::string port     ;
-             static std::string address  ;
+               static std::string docRoot  ;
+               static std::string port     ;
+               static std::string address  ;
              
-              static int argc;
-              static char **argv;
+            static int argc;
+            static char **argv;
            };
   
   /*   static std::string* jScript;
@@ -125,7 +110,6 @@ namespace bbtk
    // Wt::WApplication *createApplication(const Wt::WEnvironment& env);
     //==================================================================    
 
-
     //==================================================================    
     virtual void bbShowWindow();
     //==================================================================   
@@ -138,14 +122,11 @@ namespace bbtk
    void bbwtProcess();
 
   private:
-    
-    Wt::WApplication* bbApp;
-    Wt::WContainerWidget* bbmWindow;
- 
+    Wt::WApplication           *bbApp;
+    Wt::WContainerWidget       *bbmWindow;
   };
   //=================================================================
  
-
   //=================================================================
   // WxBlackBoxDescriptor declaration
   class WtBlackBoxDescriptor : public WidgetBlackBoxDescriptor<Wt::WContainerWidget>