=== MAJOR RELEASE ====

[bbtk.git] / kernel / src / bbtkWxGUIPackageBrowser.cxx

diff --git a/kernel/src/bbtkWxGUIPackageBrowser.cxx b/kernel/src/bbtkWxGUIPackageBrowser.cxx
index 515a707cdb1fd4f0156ab5d587b2ca597ee7ffab..4f7a84dd6359633668994851dce06f9a858b1a36 100644 (file)
--- a/kernel/src/bbtkWxGUIPackageBrowser.cxx
+++ b/kernel/src/bbtkWxGUIPackageBrowser.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/31 13:18:04 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/04/18 12:59:16 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -47,9 +47,10 @@
 namespace bbtk
 {
   //================================================================
-  WxGUIPackageBrowserBlackBox::WxGUIPackageBrowserBlackBox(wxWindow* parent,
-                                                          WxGUIPackageBrowser* browser,
-                                                          BlackBoxDescriptor* descr) :
+  WxGUIPackageBrowserBlackBox::
+  WxGUIPackageBrowserBlackBox(wxWindow* parent,
+                             WxGUIPackageBrowser* browser,
+                             BlackBoxDescriptor::Pointer descr) :
     wxPanel(parent, -1),
     mBrowser(browser),
     mDescriptor(descr)
@@ -303,7 +304,7 @@ namespace bbtk
                                    WxGUIPackageBrowserUser* user )
     : wxPanel(parent, -1),
       mUser(user),
-      mInterpreter(0)
+      mInterpreter()
   {
 
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
@@ -339,26 +340,26 @@ namespace bbtk
   //================================================================
   WxGUIPackageBrowser::~WxGUIPackageBrowser()
   {
-    std::cout << "del interpreter" << std::endl;
-    if (mInterpreter) delete mInterpreter;
-    std::cout << "ok" << std::endl;
+    // std::cout << "del interpreter" << std::endl;
+    //   if (mInterpreter) delete mInterpreter;
+    //    std::cout << "ok" << std::endl;
   }
   //================================================================
 
   //================================================================
   void WxGUIPackageBrowser::IncludeAll()
   {
-    if (!mInterpreter) mInterpreter = new bbtk::Interpreter();
+    if (!mInterpreter) mInterpreter = bbtk::Interpreter::New();
     mInterpreter->SetCommandLine(true);
     mInterpreter->InterpretLine("include *");
 
-    Factory* F = mInterpreter->GetExecuter()->GetFactory();
+    Factory::Pointer F = mInterpreter->GetExecuter()->GetFactory();
     BuildFromFactory(F);
   }
   //================================================================
   //================================================================
   
-  void WxGUIPackageBrowser::BuildFromFactory(Factory* F)
+  void WxGUIPackageBrowser::BuildFromFactory(Factory::Pointer F)
   {
 #ifndef LINUX
     wxTreeMultiWindowInfo wndinfo(wxTMC_BG_ADJUST_CNT, 8, 0);
@@ -370,7 +371,7 @@ namespace bbtk
     Factory::PackageMapType::const_iterator i;
     for (i=M.begin();i!=M.end();++i)
       {
-       Package* P = i->second.mPackage;
+       Package::Pointer P = i->second;
        wxString packname = std2wx(P->GetName());
        if (packname==_T("user")) continue;
        wxTreeMultiItem pack = mTree->AddRoot(packname,packname);