From c3c4e45b2bf36786eba61b281b779d599768bb2f Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Wed, 10 Jun 2009 11:36:51 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkAtomicBlackBoxMacros.h | 7 +++++-- kernel/src/bbtkWidgetBlackBox.h | 7 +++++-- kernel/src/bbtkWidgetBlackBoxWindow.h | 7 ++++--- kernel/src/bbtkWidgetBlackBoxWindow.txx | 8 ++++---- kernel/src/bbtkWxBlackBox.h | 5 +++-- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h index b9c099f..17e1c05 100644 --- a/kernel/src/bbtkAtomicBlackBoxMacros.h +++ b/kernel/src/bbtkAtomicBlackBoxMacros.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2009/05/28 08:12:05 $ - Version: $Revision: 1.18 $ + Date: $Date: 2009/06/10 11:36:51 $ + Version: $Revision: 1.19 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -544,6 +544,9 @@ (&CLASS::bbSetOutput##NAME) ) ) //============================================================================ + +//JCP 09JUIN2009 BBTK_EXPORT + //============================================================================ /// Template AtomicBlackBox std implementation of ctor and dtor #define BBTK_BLACK_BOX_TEMPLATE_IMPLEMENTATION(CLASS,PARENT) \ diff --git a/kernel/src/bbtkWidgetBlackBox.h b/kernel/src/bbtkWidgetBlackBox.h index fc09745..045d8a5 100644 --- a/kernel/src/bbtkWidgetBlackBox.h +++ b/kernel/src/bbtkWidgetBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWidgetBlackBox.h,v $ Language: C++ - Date: $Date: 2009/06/08 14:50:04 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/06/10 11:36:51 $ + Version: $Revision: 1.6 $ ========================================================================*/ @@ -58,7 +58,10 @@ namespace bbtk /// widget black boxes for a specific GUI toolkit inherit with /// apropriate traits. /// Declares the common inputs / outputs and interface to all widget boxes + +//JCP 09JUIN2009 BBTK_EXPORT template + class /*BBTK_EXPORT*/ WidgetBlackBox : public bbtk::AtomicBlackBox { public: diff --git a/kernel/src/bbtkWidgetBlackBoxWindow.h b/kernel/src/bbtkWidgetBlackBoxWindow.h index 04344ad..eb116cc 100644 --- a/kernel/src/bbtkWidgetBlackBoxWindow.h +++ b/kernel/src/bbtkWidgetBlackBoxWindow.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWidgetBlackBoxWindow.h,v $ Language: C++ - Date: $Date: 2009/05/19 10:19:23 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/06/10 11:36:51 $ + Version: $Revision: 1.3 $ ========================================================================*/ @@ -57,8 +57,9 @@ namespace bbtk //================================================================== // The base of the hierarchy of windows associated to a WidgetBlackBox +//EED 10/06/2009 /*BBTK_EXPORT*/ template - class BBTK_EXPORT WidgetBlackBoxWindow + class /*BBTK_EXPORT*/ WidgetBlackBoxWindow { public: typedef typename WidgetBlackBox::Pointer WidgetBlackBoxPointer; diff --git a/kernel/src/bbtkWidgetBlackBoxWindow.txx b/kernel/src/bbtkWidgetBlackBoxWindow.txx index e2ac999..bc77e9b 100644 --- a/kernel/src/bbtkWidgetBlackBoxWindow.txx +++ b/kernel/src/bbtkWidgetBlackBoxWindow.txx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWidgetBlackBoxWindow.txx,v $ Language: C++ - Date: $Date: 2009/05/28 08:12:06 $ - Version: $Revision: 1.3 $ + Date: $Date: 2009/06/10 11:36:52 $ + Version: $Revision: 1.4 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -107,14 +107,14 @@ namespace bbtk template void WidgetBlackBoxWindow::bbDestroy() { - /* + if (mBox.expired()) return; bbtkDebugMessage("widget",9,"WidgetBlackBoxWindow::bbDestroy() [" <bbGetName()<<"]"<DecNbWindowsAlive(); mBox.lock()->bbSetWindow(0); - */ + } //========================================================================= diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h index f2c91cc..afe6175 100644 --- a/kernel/src/bbtkWxBlackBox.h +++ b/kernel/src/bbtkWxBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.h,v $ Language: C++ - Date: $Date: 2009/05/28 08:24:23 $ - Version: $Revision: 1.30 $ + Date: $Date: 2009/06/10 11:36:53 $ + Version: $Revision: 1.31 $ ========================================================================*/ @@ -63,6 +63,7 @@ namespace bbtk //================================================================== /// Widget black boxes +//EED 10/06/2009 /*BBTK_EXPORT*/ class BBTK_EXPORT WxBlackBox : public bbtk::WidgetBlackBox { public: -- 2.45.1