Changes under win32

diff --git a/kernel/src/bbtkConnection.h b/kernel/src/bbtkConnection.h
index 6c81d9e280b4b49e210828044740c8842c9f3f17..36b20b8a39b0310d34342e99372093e2198c7f3b 100644 (file)
--- a/kernel/src/bbtkConnection.h
+++ b/kernel/src/bbtkConnection.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.h,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 14:42:16 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/04/21 14:36:51 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -65,7 +65,7 @@ namespace bbtk
   /// Out-of-date status value
   const IOStatus OUTOFDATE = 2;
 
-  const std::string& GetIOStatusString( IOStatus );
+  BBTK_EXPORT const std::string& GetIOStatusString( IOStatus );
 
 
   class BBTK_EXPORT Connection : public Object

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 5f72953fa743ddc5492f287f296f5be8c2f7c1db..921682c743a9922525d81940f17aab36241d43e9 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/01/13 08:45:27 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2009/04/21 14:36:51 $
+  Version:   $Revision: 1.25 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -624,12 +624,17 @@ namespace bbtk
     bbtkDebugMessage("package",5,"==> Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
 
     std::set<Package::WeakPointer>::iterator i;
-    for (i=mReleasedDynamicallyLoadedPackages.begin();
-        i!=mReleasedDynamicallyLoadedPackages.end();
-        ++i)
-      {
-       if (!i->expired()) UnLoad(*i);
-      }
+
+//JCP- 21-04-09
+       if(mReleasedDynamicallyLoadedPackages.size()>0){
+               for (i=mReleasedDynamicallyLoadedPackages.begin();
+               i!=mReleasedDynamicallyLoadedPackages.end();
+               ++i)
+               {
+               if (!i->expired()) UnLoad(*i);
+               }
+       }
+//JCP- 21-04-09
     bbtkDebugMessage("package",5,"<== Package::UnLoadReleasedDynamicallyLoadedPackages()"<<std::endl);
   }
   //==========================================================================

diff --git a/kernel/src/bbtkWidgetBlackBox.h b/kernel/src/bbtkWidgetBlackBox.h
index deed3f707b09d000669ed33e50464ae90ef50729..66f2bf133ede6c3fd2de84b1c13f9afad5cf4dd0 100644 (file)
--- 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/04/08 07:56:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/04/21 14:36:51 $
+  Version:   $Revision: 1.2 $
 ========================================================================*/
 
 
@@ -60,7 +60,7 @@ namespace bbtk
   /// apropriate traits.
   /// Declares the common inputs / outputs and interface to all widget boxes
   template <class W>
-  class BBTK_EXPORT WidgetBlackBox : public bbtk::AtomicBlackBox  
+  class /*BBTK_EXPORT*/ WidgetBlackBox : public bbtk::AtomicBlackBox  
   { 
   public:
     //    typedef WidgetTraits Traits;

diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx
index 7413e8c0898576d630a4e97a8e079db560a37bf6..39738cf6b3032aaebe8689488fb17d7204ac3a5b 100644 (file)
--- a/kernel/src/bbtkWidgetBlackBox.txx
+++ b/kernel/src/bbtkWidgetBlackBox.txx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWidgetBlackBox.txx,v $
   Language:  C++
-  Date:      $Date: 2009/04/08 07:56:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/04/21 14:36:51 $
+  Version:   $Revision: 1.2 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -168,7 +168,7 @@ namespace bbtk
   template <class T>  
   typename WidgetBlackBox<T>::WidgetPointer  
   WidgetBlackBox<T>::bbCreateWidgetOfInput
-  (const std::string& in, WidgetBlackBox<T>::WidgetPointer parent)
+  (const std::string& in, typename WidgetBlackBox<T>::WidgetPointer parent)
   {
     Widget* w = 0;
     // If input is connected