X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWtBlackBox.cxx;fp=kernel%2Fsrc%2FbbtkWtBlackBox.cxx;h=70d8ff0911c539eb820c8178e7dfa460e5e95cca;hb=ce4491d66577c9daf930cb8744e738e4b7220fe7;hp=01a91bec01643466e5a9844ac058a18cfb5980ca;hpb=1588a95ff236c187f3c6cdec14a5d1e899d230c9;p=bbtk.git

diff --git a/kernel/src/bbtkWtBlackBox.cxx b/kernel/src/bbtkWtBlackBox.cxx
index 01a91be..70d8ff0 100644
--- 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);
-
   }