X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkPackage.cxx;h=31f5a13a8b2bbc5895f80b4f9763744706699aa8;hb=d8041d1ef54a73acc2306557435f6b04edf60daf;hp=94286b37811f8f99a3cc8b17a8b1ddbd51c0636f;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 94286b3..31f5a13 100644
--- 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: 2008/04/18 12:59:15 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/05/06 13:45:12 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -265,7 +265,8 @@ namespace bbtk
     std::string packname = pack.lock()->mName;
     std::string dname = descr.lock()->GetTypeName();    
     bbtkDebugMessage("package",3,"==> Package::ReleaseBlackBoxDescriptor('"<<
-		     packname<<"','"<<dname<<"')"<<bbtkendl);
+		     packname<<"','"<<dname<<"') : refs="
+		     <<descr.use_count()<<bbtkendl);
 
     long dyn = pack.lock()->mDynamicLibraryHandler ? 1:0; 
     long ndesc = pack.lock()->GetBlackBoxMap().size();
@@ -292,7 +293,8 @@ namespace bbtk
     UnLoadDynamicLibrary(pack,false);
         
     bbtkDebugMessage("package",3,"<== Package::ReleaseBlackBoxDescriptor('"<<
-		     packname<<"','"<<dname<<"')"<<bbtkendl);
+		     packname<<"','"<<dname<<"'): refs="
+		     <<descr.use_count()<<bbtkendl);
     /*
     if (!pack.expired())
       {
@@ -430,7 +432,7 @@ namespace bbtk
     getvername += 
       BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_BBTK_VERSION_FUNCTION_NAME);
     DLGetPackageBBTKVersionFunction getbbtkversion 
-      = (DLGetPackageBBTKVersionFunction)(GetProcAdress(handler,
+      = (DLGetPackageBBTKVersionFunction)(GetProcAddress(handler,
 							getvername.c_str()));
     if (!getbbtkversion)
       {
@@ -459,7 +461,7 @@ namespace bbtk
      // Loads the Package get function
     std::string getpackname(package_name);
     getpackname += BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_FUNCTION_NAME);
-    getpack = (DLGetPackageFunction)(GetProcAdress(handler, getpackname.c_str()));
+    getpack = (DLGetPackageFunction)(GetProcAddress(handler, getpackname.c_str()));
     if (!getpack)
       {
 	FreeLibrary(handler);
@@ -473,7 +475,7 @@ namespace bbtk
     // Loads the Package delete function
     std::string delpackname(package_name);
     delpackname += BBTK_STRINGIFY_SYMBOL(BBTK_DEL_PACKAGE_FUNCTION_NAME);
-    delpack = (DLDeletePackageFunction)(GetProcAdress(handler, delpackname.c_str()));
+    delpack = (DLDeletePackageFunction)(GetProcAddress(handler, delpackname.c_str()));
     if (!delpack)
       {
 	FreeLibrary(handler);
@@ -696,7 +698,7 @@ namespace bbtk
 			<<name<<"\")"<<bbtkendl);
 
     AdaptorKey key(typein,typeout,
-		   BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR);
+		   BlackBoxDescriptor::DEFAULT_GUI);
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
       {
@@ -729,7 +731,7 @@ namespace bbtk
     AdaptorKey key(/*typein*/
 		   DataInfo(typeid(void),""),
 		   typeout,
-		   BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR);
+		   BlackBoxDescriptor::DEFAULT_GUI);
     // First try to find a single widget adaptor
     AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
     if (i == mAdaptorMap.end())  
@@ -825,7 +827,7 @@ namespace bbtk
 	  }
       }
     // If it is a default adaptor, also register it in the adaptors map
-    else if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR)
+    else if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_GUI)
       {
 	bbtkDebugMessage("Kernel",8,"Package<"<<GetName()<<">::RegisterBlackBox(\""<<d->GetTypeName()<<"\") : The box is a widget adaptor, inserting it in adaptors map ..."<<std::endl);   
 	
@@ -864,7 +866,7 @@ namespace bbtk
   //===================================================================
   void Package::CheckBoxes() const
   {
-    bbtkMessage("Debug",1,"****** Checking Package "<<(void*)this
+    bbtkMessage("debug",1,"****** Checking Package "<<(void*)this
 		<<" ["<<GetName()<<"]"<<std::endl);
     BlackBoxMapType::const_iterator i;
     for (i=mBlackBoxMap.begin();
@@ -873,7 +875,7 @@ namespace bbtk
       {
 	i->second->Check(true);
       }
-    bbtkMessage("Debug",1,"****** Checking Package "<<(void*)this
+    bbtkMessage("debug",1,"****** Checking Package "<<(void*)this
 		<<" ["<<GetName()<<"] ... OK"<<std::endl);
   }
   //===================================================================