X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=8bf6f65548908d4d958790acfa8e046dae704bf6;hb=c7c01e26ba6aa2f3dda7f1ce6ee1b39a0d6db57c;hp=a9b4f0b6215b75dae564b8362599d31626395add;hpb=85be7d05390ee84a66308c17c740565456ce15d2;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index a9b4f0b..8bf6f65 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -99,21 +99,13 @@ namespace bbtk
 	     ),
     mBox(b)
   {   
-		std::cout<<"Creando Widget DELETE ME bbtkWxBlackBox.cxx--"<<std::endl;
-		std::cout<<"NAME :  "<<bbtk::wx2std(title);
-		if(parent)
-			std::cout<<"PARENT :   "<<bbtk::wx2std(parent->GetName())<<std::endl;
-		else
-			std::cout<<"        SIN PADRE "<<std::endl;
     bbtkDebugMessage("widget",9,"["<<b->bbGetName()<<"] WxFrame()"
 		     <<std::endl);
     Wx::IncNbWindowsAlive();
     b->bbSetWindow(this);
     // Insert the widget into the window
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-	std::cout<<"------------------------------------USER CREATE WIDGET pre DELETE ME bbtkWxBlackBox.cxx--"<<std::endl;
     b->bbUserCreateWidget(this);
-	std::cout<<"------------------------------------USER CREATE WIDGET post DELETE ME bbtkWxBlackBox.cxx--"<<std::endl;
     wxWindow* widget = b->bbGetOutputWidget();
     sizer->Add( widget, 1, wxALL|wxGROW, 2);
     SetSizer(sizer);
@@ -123,14 +115,22 @@ namespace bbtk
   //==================================================================
   WxFrame::~WxFrame() 
     { 
+	
+printf("EED WxFrame::~WxFrame\n");	
+	
       if (mBox.lock())
-	bbtkDebugMessage("widget",9,"["<<mBox.lock()->bbGetName()
+	  {
+		bbtkDebugMessage("widget",9,"["<<mBox.lock()->bbGetName()
 			 <<"] $$$$$$$$$$$$$$$$$$$ ~WxFrame()"
 			 <<std::endl);
-      else 
-	bbtkDebugMessage("widget",9,"[DEAD] $$$$$$$$$$$$$$$$$$$$$ ~WxFrame()"<<std::endl);
-      //bbtkDebugMessage("widget",9,"WxFrame::~WxFrame()"<<std::endl);
-      if (mBox.lock()) mBox.lock()->bbSetWindow(0); 
+      } else { 
+		bbtkDebugMessage("widget",9,"[DEAD] $$$$$$$$$$$$$$$$$$$$$ ~WxFrame()"<<std::endl);
+		//bbtkDebugMessage("widget",9,"WxFrame::~WxFrame()"<<std::endl);
+	  } // if mBox.lock()
+      if (mBox.lock()) 
+	  {
+		mBox.lock()->bbSetWindow(0); 
+	  } // if mBox.lock()
       Wx::DecNbWindowsAlive();
     }
    //==================================================================
@@ -278,8 +278,8 @@ namespace bbtk
     WxDialog* w = 0;  
     w = new WxDialog( GetThisPointer<WxBlackBox>(),
 		      Wx::GetTopWindow(),
-		      std2wx( bbGetInputWinTitle()  
-			      + " - bbtk (c) CREATIS"),
+//		      std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS"),
+		      std2wx( ConstructWinTitle() ),
 		      wxSize( bbGetInputWinWidth() , 
 			      bbGetInputWinHeight() ) );
     w->Show(false);
@@ -293,7 +293,6 @@ namespace bbtk
   /// Callback for creating a Frame window 
   void WxBlackBox::bbCreateFrameWindow()
   {
-    std::cout<<"--/////////////*****////////////////--JFGA Testing bbCreateFrameWindow Starting ....."<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
     bbtkBlackBoxDebugMessage("widget",3,
 		     "==> WxBlackBox::bbCreateFrameWindow() - parent = "
 		     <<Wx::GetTopWindow()
@@ -301,12 +300,13 @@ namespace bbtk
     WxFrame* w = 0;  
     w = new WxFrame( GetThisPointer<WxBlackBox>(),
 		     Wx::GetTopWindow(),
-		     std2wx( bbGetInputWinTitle()  
-			     + " - bbtk (c) CREATIS"),
+//		     std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS"),
+		     std2wx( ConstructWinTitle() ),
 		     wxSize( bbGetInputWinWidth() , 
 			     bbGetInputWinHeight() ) );
-    std::cout<<"--/////////////*****////////////////!!--JFGA Testing bbCreateFrameWindow Done ........"<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
     w->Show();
+
+
    }
 
   //==================================================================    
@@ -316,11 +316,9 @@ namespace bbtk
   {
     bbtkBlackBoxDebugMessage("widget",9,"==> WxBlackBox::bbSetWindow("<<w<<")"<<std::endl);
     if ((bbmWindow != 0)&&(w!=0)) 
-      { 
-	std::cout << "ERRRRRRRROOOOR"<<std::endl; 
-      }
-		std::cout<<"SetWindow   DELETE ME bbtkWxBlackBox.cxx ------"<<std::endl;
-		std::cout<<"WINDOW     :  "<<bbtk::wx2std(w->GetName())<<std::endl;
+	{ 
+		std::cout << "WxBlackBox::bbSetWindow   ?? EED ?? ERRRRRRRROOOOR"<<std::endl; 
+	}
     bbmWindow = w;
   }
   //==================================================================    
@@ -328,7 +326,6 @@ namespace bbtk
   //==================================================================    
   void WxBlackBox::bbShowWindow()
   {
-	 std::cout<<"--!!--JFGA Testing bbShowWindow PRE IF "<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
     if ((bbmWindow) && (!bbIsShown()))
       {
 	bbtkBlackBoxDebugMessage("widget",3,"==> WxBlackBox::bbShowWindow()"
@@ -339,11 +336,12 @@ namespace bbtk
 	  }
 	else	
 	  {
-	    std::cout<<"--!!--JFGA Testing bbShowWindow "<<bbGetInputWinTitle()<<"......!! D E L E T  M E !! bbtkWxBlackBox.cxx"<<std::endl;
 	    bbGetWindow()->Show();
 	    bbSetShown(true);
 	  } 
-      }
+      } // if
+
+
   }
   //==================================================================    
 
@@ -366,6 +364,27 @@ namespace bbtk
 
   }
   //==================================================================    
+  
+  //==================================================================    
+  void WxBlackBox::PutWinTitle()
+  {
+	if ( ! bbIsOutputWidgetConnected() )
+    {
+		wxTopLevelWindow* wParent = (wxTopLevelWindow*)( bbGetOutputWidget()->GetParent() );
+		wParent->SetTitle( std2wx( ConstructWinTitle() ) );
+	} // if
+  }
+  //==================================================================    
+
+  //==================================================================    
+  std::string WxBlackBox::ConstructWinTitle()
+  {
+	std::string title( bbGetInputWinTitle() + " - bbtk (c) CREATIS");
+	return title;
+  }
+  //==================================================================    
+
+
 
 }//namespace bbtk