From a870bb0fc6dc81f73e4b1752429683b1eba62b57 Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 2 Aug 2019 17:28:08 +0200
Subject: [PATCH] #3296 BBTK Bug New Normal  -  Error windows Close application

---
 kernel/src/bbtkWidgetBlackBox.txx       |  3 +++
 kernel/src/bbtkWidgetBlackBoxWindow.txx |  4 ++++
 kernel/src/bbtkWx.cxx                   |  4 ++++
 kernel/src/bbtkWxBlackBox.cxx           | 18 +++++++++++++-----
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx
index 6f2e8a6..0c2a7a1 100644
--- a/kernel/src/bbtkWidgetBlackBox.txx
+++ b/kernel/src/bbtkWidgetBlackBox.txx
@@ -295,6 +295,9 @@ namespace bbtk
   {
     bbtkBlackBoxDebugMessage("widget",1,"=> WidgetBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
+			
+printf("EED WidgetBlackBoxWindow<W>::bbDestroy\n");			
+
 
     if (bbGetWindow()!=0) bbGetWindow()->bbDestroy();
 
diff --git a/kernel/src/bbtkWidgetBlackBoxWindow.txx b/kernel/src/bbtkWidgetBlackBoxWindow.txx
index 13d1273..14413ed 100644
--- a/kernel/src/bbtkWidgetBlackBoxWindow.txx
+++ b/kernel/src/bbtkWidgetBlackBoxWindow.txx
@@ -71,6 +71,8 @@ namespace bbtk
   template <class W>
   WidgetBlackBoxWindow<W>::~WidgetBlackBoxWindow()
   {
+  printf("EED WidgetBlackBoxWindow<W>::~WidgetBlackBoxWindow\n");
+  
     bbtkDebugMessage("widget",9,
 		     "WidgetBlackBoxWindow::~WidgetBlackBoxWindow() "
 		     <<this<<std::endl);
@@ -116,6 +118,8 @@ namespace bbtk
   void WidgetBlackBoxWindow<W>::bbDestroy()
   {
     
+printf("EED WidgetBlackBoxWindow<W>::bbDestroy \n");	
+
     if (mBox.expired()) return;
     bbtkDebugMessage("widget",9,"WidgetBlackBoxWindow::bbDestroy() [" 
 		     <<mBox.lock()->bbGetName()<<"]"<<std::endl);
diff --git a/kernel/src/bbtkWx.cxx b/kernel/src/bbtkWx.cxx
index 78848c1..31b473f 100644
--- a/kernel/src/bbtkWx.cxx
+++ b/kernel/src/bbtkWx.cxx
@@ -106,6 +106,10 @@ namespace bbtk
   {
     if (mgWxApp!= 0) 
       {
+	  
+printf("EED Wx::DestroyWxAppIfNeeded \n");
+	  
+	  
 	//	bbtkDebugMessage("wx",1,"  --> Destructing bbtk WxApp"<<std::endl);
 	//delete mgWxApp;
 	//	mgWxApp = 0;
diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 6a26356..8bf6f65 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -115,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();
     }
    //==================================================================
-- 
2.47.1