*** empty log message ***

diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt
index 72c770742c717db2e28cf62be8b6df5f37984a19..0a02f7d9cb7847ad71f7ac59b5f6ec25a6b87a9e 100644 (file)
--- a/kernel/appli/CMakeLists.txt
+++ b/kernel/appli/CMakeLists.txt
@@ -20,3 +20,5 @@ SUBDIRS(bbCreatePackage)
 SUBDIRS(bbCreateBlackBox) 
 
 SUBDIRS(bbed)
+
+SUBDIRS(bbhelp)

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index 6b8d402ac8a5da09bed23f9547c6eca49697b1af..3f46046d14c92b0f4e2b9255ec8b4f2e25628548 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/07 11:06:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/20 15:27:56 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,8 +31,8 @@ namespace bbtk
     : BlackBox(name)
   {
     bbtkDebugMessageInc("Kernel",7,
-                       "AtomicBlackBox::AtomicBlackBox(\""
-                       <<name<<"\")"<<std::endl);
+            "AtomicBlackBox::AtomicBlackBox(\""
+            <<name<<"\")"<<std::endl);
     bbtkDebugDecTab("Kernel",7);
   }
   //========================================================================= 
@@ -40,14 +40,14 @@ namespace bbtk
   //=========================================================================
   /// Constructor from an existing box (copy) with a new name 
   AtomicBlackBox::AtomicBlackBox(AtomicBlackBox& from, 
-                            const std::string &name, 
-                            bool alloc)
+                const std::string &name, 
+                bool alloc)
     : BlackBox(from,name)
   {
     bbtkDebugMessageInc("Kernel",7,
-                       "AtomicBlackBox::AtomicBlackBox("
-                       <<from.bbGetFullName()<<",\""
-                       <<name<<"\")"<<std::endl);
+        "AtomicBlackBox::AtomicBlackBox("
+        <<from.bbGetFullName()<<",\""
+        <<name<<"\")"<<std::endl);
     bbtkDebugDecTab("Kernel",7);
     
   }
@@ -59,7 +59,7 @@ namespace bbtk
   AtomicBlackBox::~AtomicBlackBox()
   {
     bbtkDebugMessage("Kernel",7,"AtomicBlackBox::~AtomicBlackBox()"
-                    <<std::endl);
+            <<std::endl);
   } 
   //=========================================================================
   
@@ -70,75 +70,68 @@ namespace bbtk
   IOStatus AtomicBlackBox::bbBackwardUpdate( Connection* caller )
   {
     bbtkDebugMessageInc("Process",1,
-                       "=> AtomicBlackBox::bbBackwardUpdate() ["
-                       <<bbGetFullName()<<"]"<<std::endl);
+            "=> AtomicBlackBox::bbBackwardUpdate() ["
+            <<bbGetFullName()<<"]"<<std::endl);
     
-    bbtkDebugMessage("Process",5,"Initial Status  = "<<bbGetStatus()<<std::endl);
-    bbtkDebugMessage("Process",5,"BoxProcessMode  = "<<bbGetInputBoxProcessMode()<<std::endl);
+    bbtkDebugMessage("Process",5,"Initial Status  = "<<bbGetStatus()
+                    <<std::endl);
+    bbtkDebugMessage("Process",5,"BoxProcessMode  = "
+                    <<bbGetInputBoxProcessMode()<<std::endl);
    
     /* 
     if ( bbGetStatus() == UPDATING ) 
       {
-       bbtkMessage("Warning",1,"!! WARNING !! Cyclic pipeline execution (bbBackwardUpdate ["<<bbGetFullName()<<"] reentered). This may indicate an error in pipeline conception"<<std::endl);
-       //      return UPTODATE;
-       bbSetStatus(MODIFIED);
+    bbtkMessage("Warning",1,"!! WARNING !! Cyclic pipeline execution (bbBackwardUpdate ["<<bbGetFullName()<<"] reentered). This may indicate an error in pipeline conception"<<std::endl);
+    // return UPTODATE;
+    bbSetStatus(MODIFIED);
       }
     */
 
     if ( ( bbGetStatus() == MODIFIED ) ||
-        ( bbBoxProcessModeIsAlways() ) )
+        ( bbBoxProcessModeIsAlways() ) )
       {
-       bool wasExecuting = bbGlobalGetSomeBoxExecuting();
-       bbGlobalSetSomeBoxExecuting(true);
+        bool wasExecuting = bbGlobalGetSomeBoxExecuting();
+        bbGlobalSetSomeBoxExecuting(true);
 
-       //      bbSetStatus(UPDATING);
-
-       // Updates its inputs
-       IOStatus s = bbUpdateInputs();
-       
-       bbtkDebugMessage("Process",6,"Inputs post-update status = "<<s<<std::endl);
-       // If all inputs are in UPTODATE post-update status 
-       // and mProcessMode is not "Always"
-       // then the box is now UPTODATE
-       if ( ( s == UPTODATE ) && 
-            ( ! bbBoxProcessModeIsAlways() ) ) 
-         {
-           bbSetStatus(UPTODATE);
-         }
-       else 
-         {
-           // else it remains MODIFIED
-           bbSetStatus(MODIFIED);
-         }     
-
-       // Creates the window (WxBlackbox)
-       //      bbCreateWindow();
-
-       // Children update (WxContainerBlackBox)
-       //      bbUpdateChildren(caller);       
-
-       // User process
-       bbProcess();
-
-       // Displays the window (WxBlackbox)
-       bbShowWindow(caller);
-
-
-
-       bbGlobalSetSomeBoxExecuting(wasExecuting);
+        //     bbSetStatus(UPDATING);
 
+        // Updates its inputs
+        IOStatus s = bbUpdateInputs();
+    
+        bbtkDebugMessage("Process",6,"Inputs post-update status = "<<s<<std::endl);
+        // If all inputs are in UPTODATE post-update status 
+        // and mProcessMode is not "Always"
+        // then the box is now UPTODATE
+        if ( ( s == UPTODATE ) && 
+            ( ! bbBoxProcessModeIsAlways() ) ) 
+            {
+                bbSetStatus(UPTODATE);
+            }
+        else 
+            {
+                // else it remains MODIFIED
+                bbSetStatus(MODIFIED);
+            }
+
+        // User process
+        bbProcess();
+
+        // Displays the window (WxBlackbox)
+        bbShowWindow(caller);
+
+        bbGlobalSetSomeBoxExecuting(wasExecuting);
 
       }
     else 
       {
-       bbtkDebugMessage("Process",5,"Up-to-date : nothing to do"<<std::endl);
+        bbtkDebugMessage("Process",5,"Up-to-date : nothing to do"<<std::endl);
       }
 
     bbtkDebugMessage("Process",5,"Final Status    = "
-                    <<bbGetStatus()<<std::endl);
+            <<bbGetStatus()<<std::endl);
     bbtkDebugMessage("Process",1,
-                    "<= AtomicBlackBox::bbBackwardUpdate() ["
-                    <<bbGetFullName()<<"]"<<std::endl);
+            "<= AtomicBlackBox::bbBackwardUpdate() ["
+            <<bbGetFullName()<<"]"<<std::endl);
     bbtkDebugDecTab("Process",1);
 
     return bbGetStatus();
@@ -151,11 +144,12 @@ namespace bbtk
   Data AtomicBlackBox::bbGetOutput( const std::string &name )
   {
     bbtkDebugMessageInc("Data",7,
-                       "AtomicBlackBox::bbGetOutput(\""<<name<<"\") ["
-                       <<bbGetFullName()<<"]"
-                       <<std::endl);
+            "AtomicBlackBox::bbGetOutput(\""<<name<<"\") ["
+            <<bbGetFullName()<<"]"
+            <<std::endl);
     
-    Data p = ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()->GetOutputDescriptor(name))->GetGetFunctor()->Get(this);
+    Data p = ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()
+                ->GetOutputDescriptor(name))->GetGetFunctor()->Get(this);
     
     bbtkDebugDecTab("Data",7);
     return p;
@@ -168,11 +162,12 @@ namespace bbtk
   Data AtomicBlackBox::bbGetInput( const std::string &name ) 
   {
     bbtkDebugMessageInc("Data",7,
-                       "AtomicBlackBox::bbGetInput(\""<<name<<"\") ["
-                       <<bbGetFullName()<<"]"
-                       <<std::endl);  
+            "AtomicBlackBox::bbGetInput(\""<<name<<"\") ["
+            <<bbGetFullName()<<"]"
+            <<std::endl);  
     
-    Data p = ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()->GetInputDescriptor(name))->GetGetFunctor()->Get(this);
+    Data p = ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()
+                ->GetInputDescriptor(name))->GetGetFunctor()->Get(this);
     
     bbtkDebugDecTab("Data",7);
     return p;
@@ -185,11 +180,12 @@ namespace bbtk
   void AtomicBlackBox::bbSetOutput( const std::string &name, Data data)
   {
     bbtkDebugMessageInc("Data",7,
-                       "AtomicBlackBox::bbSetOutput(\""<<name<<"\",data) ["
-                       <<bbGetFullName()<<"]"
-                       <<std::endl); 
+            "AtomicBlackBox::bbSetOutput(\""<<name<<"\",data) ["
+            <<bbGetFullName()<<"]"
+            <<std::endl); 
     
-    ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()->GetOutputDescriptor(name))->GetSetFunctor()->Set(this,data);
+    ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()
+        ->GetOutputDescriptor(name))->GetSetFunctor()->Set(this,data);
     
     bbtkDebugDecTab("Data",7);
   }  
@@ -198,19 +194,21 @@ namespace bbtk
   
   //=========================================================================
   ///  Sets the data of the input called <name>
-  void AtomicBlackBox::bbSetInput( const std::string &name, Data data, 
-                                bool setModified )
+  void AtomicBlackBox::bbSetInput(
+                const std::string &name,
+                Data data, 
+                bool setModified )
   {
     bbtkDebugMessageInc("Data",7,
-                       "AtomicBlackBox::bbSetInput(\""<<name<<"\",data) ["
-                       <<bbGetFullName()<<"]"
-                       <<std::endl);  
+            "AtomicBlackBox::bbSetInput(\""<<name<<"\",data) ["
+            <<bbGetFullName()<<"]"
+            <<std::endl);  
     ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()->GetInputDescriptor(name))->GetSetFunctor()->Set(this,data);
     
     if (setModified) 
-      {
-       bbSetModifiedStatus();
-      }
+        {
+            bbSetModifiedStatus();
+        }
     
     bbtkDebugDecTab("Data",7);
   }
@@ -218,20 +216,25 @@ namespace bbtk
   
     //=========================================================================
   ///  Sets the data of the input called <name>
-  void AtomicBlackBox::bbBruteForceSetInputPointer( const std::string &name, 
-                                                 void* data, 
-                                                 bool setModified )
+  void AtomicBlackBox::bbBruteForceSetInputPointer
+    (
+                    const std::string &name, 
+                    void* data, 
+                    bool setModified
+    )
   {
     bbtkDebugMessageInc("Data",7,
-                       "AtomicBlackBox::bbBruteForceSetInputPointer(\""
-                       <<name<<"\",data) ["
-                       <<bbGetFullName()<<"]"
-                       <<std::endl);  
-    ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()->GetInputDescriptor(name))->GetSetFunctor()->BruteForceSetPointer(this,data);
+            "AtomicBlackBox::bbBruteForceSetInputPointer(\""
+            <<name<<"\",data) ["
+            <<bbGetFullName()<<"]"
+            <<std::endl);  
+    ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()
+        ->GetInputDescriptor(name))->GetSetFunctor()
+            ->BruteForceSetPointer(this,data);
     
     if (setModified) 
       {
-       bbSetModifiedStatus();
+        bbSetModifiedStatus();
       }
     
     bbtkDebugDecTab("Data",7);

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 39eb9ce948a2b55632a69945b8677661df6f5c22..7b5fa779af57647042f24cdfee4c046f7d2d5480 100644 (file)
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/03/20 11:04:57 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2008/03/20 15:27:56 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,7 +45,8 @@ namespace bbtk
   Interpreter::Interpreter() 
     :
     mUser(0),
-    mCommandLine(false)
+    mCommandLine(false),
+    mThrow(false)
   {
 bufferNb =0;  
     bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1);
@@ -308,6 +309,7 @@ bufferNb =0;
 
     ExitStatus status = OK;
 
+  
     try 
     {
       SwitchToFile(filename);
@@ -335,35 +337,53 @@ bufferNb =0;
     catch (QuitException e) 
     {
       status = QUIT;
+      if (mThrow) throw QuitException();
     }
     catch (bbtk::Exception e) 
     {
-      std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
+      std::stringstream mess;
+      mess << "* ERROR : "<<e.GetMessage()<<std::endl;
       if (mFileName.size()) {
-         std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
-         std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+         mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+         mess << "* LINE  : "<<mLine.back()<<std::endl;
       }    
       status = ERROR;
+      if (mThrow) 
+       throw bbtk::Exception("Interpreter","",mess.str());
+      else
+       std::cerr << mess;
+
     }
     catch (std::exception& e) 
     {
-       std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+       std::stringstream mess;
+       mess << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
        if (mFileName.size()) {
-          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
-          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+          mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+          mess << "* LINE  : "<<mLine.back()<<std::endl;
        }  
       status = ERROR;
+      if (mThrow) 
+       throw bbtk::Exception("Interpreter","",mess.str());
+      else
+       std::cerr << mess;  
     }  
     catch (...)
-    {
-       std::cerr << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
-       if (mFileName.size()) {
-          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
-          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
-      }    
-       status = ERROR;
-    }
-
+      {
+        std::stringstream mess;
+       mess << "* UNDEFINED ERROR (not a bbtk nor a std exception)"
+            <<std::endl;
+       if (mFileName.size()) {
+          mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+          mess << "* LINE  : "<<mLine.back()<<std::endl;
+       }    
+       status = ERROR;
+       if (mThrow) 
+         throw bbtk::Exception("Interpreter","",mess.str());
+       else
+         std::cerr << mess;   
+      }
+    
     CloseAllFiles();
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
     bbtkDecTab("Interpreter",9);

diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h
index f3ca4b644b0f89c7d9dd3973b98cf1cb488aba60..9f7c60e16b788e9353a8efaf506082895be70143 100644 (file)
--- a/kernel/src/bbtkInterpreter.h
+++ b/kernel/src/bbtkInterpreter.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.h,v $ $
   Language:  C++
-  Date:      $Date: 2008/03/20 09:51:28 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2008/03/20 15:27:56 $
+  Version:   $Revision: 1.18 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -151,7 +151,9 @@ namespace bbtk
     /// Sets the bool that indicates wether we are in command line context
     void SetCommandLine(bool v = true) { mCommandLine = v; }
 
+    void SetThrow(bool b) { mThrow = b; }
 
+ 
     
 #ifdef _USE_WXWIDGETS_
     /// Sets the user of the interpreter (if any)
@@ -262,6 +264,9 @@ namespace bbtk
     std::deque< char* > mHistory;
 
    int bufferNb;
+    
+    bool mThrow;
+
   };
   // EO class Interpreter
 
@@ -269,7 +274,7 @@ namespace bbtk
   // The "Quit" exception
   struct QuitException : public bbtk::Exception
   {
-    QuitException() : bbtk::Exception("","","") {}
+    QuitException() : bbtk::Exception("Interpreter","","Quit") {}
   };
 
 }

diff --git a/kernel/src/bbtkWxGUICommand.cxx b/kernel/src/bbtkWxGUICommand.cxx
index 37c2af12538797aa659d17b55a29b76d3836729e..d540113c55689fa60afaa314aca8867852737570 100644 (file)
--- a/kernel/src/bbtkWxGUICommand.cxx
+++ b/kernel/src/bbtkWxGUICommand.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUICommand.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 11:04:57 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/03/20 15:27:56 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -78,7 +78,7 @@ namespace bbtk
     sizerCommand->Add(mwxTextCommand,1,wxGROW);
     sizerCommand->Add(btnGo);
     
-    sizer->Add(sizerCommand,0,wxLEFT | wxRIGHT | wxBOTTOM | wxGROW, 10 );
+    sizer->Add(sizerCommand,0,wxGROW);
 
     wxBoxSizer *btnsSizer      = new wxBoxSizer(wxHORIZONTAL);
     
@@ -98,7 +98,7 @@ namespace bbtk
     btnsSizer->Add( btnGraphD  );
     btnsSizer->Add( btnHelp            );
     
-    sizer->Add(btnsSizer,0,wxLEFT | wxRIGHT | wxBOTTOM  | wxGROW, 10 );
+    sizer->Add(btnsSizer,0,wxTOP|wxGROW, 10 );
 
     SetSizer(sizer);
     

diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx
index 164e244016272a360f93b2c0252cee3f2c5c3e2a..fe4619f377188dbb6b9a58f44816993669673434 100644 (file)
--- a/kernel/src/bbtkWxGUIConsole.cxx
+++ b/kernel/src/bbtkWxGUIConsole.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIConsole.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 11:04:57 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/03/20 15:27:57 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -131,11 +131,11 @@ namespace bbtk
                                             wxSize(200,0));
 
     //    mWxGUIHtmlBrowser->SetSize(wxSize(800,1000));
-    helpsizer->Add (mWxGUIHtmlBrowser,1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM  );
+    helpsizer->Add (mWxGUIHtmlBrowser,1, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5  );
 //    helpsizer->Add ( new wxButton(mwxPageHelp,-1,"perro"), 0,  wxEXPAND  );
     wxBitmap bmp_run(cc_run_xpm);
     mwxButtonRun = new wxBitmapButton( mwxPageHelp,ID_Button_Run,bmp_run);//_T("Run")  );
-    helpsizer->Add( mwxButtonRun );
+    helpsizer->Add( mwxButtonRun, 0, wxALL, 5  );
 
   
     //==============
@@ -146,8 +146,8 @@ namespace bbtk
    
     mWxGUICommand->SetFocus();
 
-    cmdsizer->Add (mWxGUIOutputMessages, 1, wxALL | wxGROW, 10);
-    cmdsizer->Add (mWxGUICommand, 1, wxALL | wxGROW, 10);
+    cmdsizer->Add (mWxGUIOutputMessages, 1, wxALL | wxGROW, 5);
+    cmdsizer->Add (mWxGUICommand, 0, wxALL | wxGROW, 5);
 
         
     // Creates and sets the parent window of all bbtk windows

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index 046144871ebb57227ec76f9ba5425ec52295592c..abc4835e484acf84178adc03529c096e4f753a27 100644 (file)
--- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 09:51:29 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/20 15:27:57 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -103,19 +103,19 @@ namespace bbtk
     
     mwxBackButton = new wxButton( panel, bwd_id,_T("<"),wxDefaultPosition,
                                  wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE |  wxLEFT | wxTOP | wxBOTTOM , 10 );
+    bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE );
     
     mwxForwardButton = new wxButton( panel, fwd_id,_T(">"),wxDefaultPosition,
                                     wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxForwardButton  , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10);
+    bsizer->Add ( mwxForwardButton  , 0, wxALIGN_CENTRE );
     
     mwxHomeButton = new wxButton( panel, home_id,_T("Home"),wxDefaultPosition,
                                  wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10  );
+    bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE );
     
     mwxReloadButton = new wxButton( panel, reload_id,_T("Reload"),wxDefaultPosition,
                                    wxDefaultSize,wxBU_EXACTFIT);
-    bsizer->Add ( mwxReloadButton  , 0, wxALIGN_CENTRE |  wxTOP | wxBOTTOM , 10  );
+    bsizer->Add ( mwxReloadButton  , 0, wxALIGN_CENTRE );
     
     /*
     mwxIncludeFileButton = new wxButton( panel, include_id,
@@ -129,7 +129,7 @@ namespace bbtk
                            wxDefaultSize,
                            wxTE_PROCESS_ENTER);
     mwxURL->SetLabel(_T("URL"));
-    bsizer->Add(mwxURL, 1, wxEXPAND | wxALL, 10);
+    bsizer->Add(mwxURL, 1, wxEXPAND);
 
 
 //    mwxHtmlWindow = new WxHtmlWindow(parent,html_id,this,size);

diff --git a/kernel/src/bbtkWxGUIOutputMessages.cxx b/kernel/src/bbtkWxGUIOutputMessages.cxx
index bb1b4227748834633f58aa79d1d56d53e5bf0314..d7d13bc4102fa275275f3991f07ae690a5b3b5e7 100644 (file)
--- a/kernel/src/bbtkWxGUIOutputMessages.cxx
+++ b/kernel/src/bbtkWxGUIOutputMessages.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIOutputMessages.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 09:51:29 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/20 15:27:57 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -62,7 +62,7 @@ namespace bbtk
 
    mwxOutputTextAttr = new wxTextAttr;
    mwxOutputTextAttr->SetFont(*FixedFont);
-   sizer->Add ( mwxOutputText, 1, wxALL | wxGROW, 10);
+   sizer->Add ( mwxOutputText, 1, wxGROW);
    
    // Redirection of std::cout to mwxTextHistory and printf
     mRedirect_cout =