Test code

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index c4729fc90b52f4e7fb261368c7f2a2a601a08eb0..2402646149a18a4b05aa35c0738c82f8b5ed24f8 100644 (file)
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -219,46 +219,38 @@ bool wxBBIApp::OnInit( )
   //See http://www.wxwindows.org/faqgtk.htm#locale
   setlocale(LC_NUMERIC, "C");
 #endif
-  
   if (cmd.quiet) bbtk::MessageManager::SetMessageLevel("max",0);
   if (cmd.debug) bbtk::MessageManager::SetMessageLevel("all",9);
-  
-
 //Borrame
 //printf ("EED bbi wxBBIApp::OnInit .....................\n");
 //cmd.input_file.push_back("/home/davila/Borrame/testwt.bbs");
-
   bbtk::WxGUIConsole *I = new bbtk::WxGUIConsole(0,_T("bbi"),wxSize(800,600));
   SetTopWindow(I);  
   if (cmd.console) I->Show(true);
-
-
   I->SetInputs(cmd.param_map);
-
   bool help_on_script = cmd.help && (cmd.input_file.size() > 0);
   if (help_on_script)         I->SetNoExecMode(true);
   if (cmd.graphical_dialog)   I->SetDialogMode(bbtk::VirtualExec::GraphicalDialog);
   if (cmd.text_dialog)        I->SetDialogMode(bbtk::VirtualExec::TextDialog);
-
   std::vector<std::string>::const_iterator i;
   bool error = false;
-
-
-  for (i=cmd.input_file.begin(); i!=cmd.input_file.end(); ++i) 
-    {
+    printf("EED wxApp::OnInit  --start\n");
+    bbtk::BlackBox::bbGlobalSetInConstruction(true);
+  for (i=cmd.input_file.begin(); i!=cmd.input_file.end(); ++i)
+  {
       error = ! I->InterpretFile(*i);
       if (error) break;
-    }
+  }
+    printf("EED wxApp::OnInit  --end\n");
+    bbtk::BlackBox::bbGlobalSetInConstruction(false);
   bool show_on_error = error && ! cmd.no_console;
   if (show_on_error) I->Show();
-
   I->SetNoExecMode(false);
-
   if (help_on_script) 
-    {
-      std::string package; 
+  {
+      std::string package;
       I->GetInterpreter()->GetExecuter()->GetFactory()->PrintHelpDescriptor("workspace",package,false);
-    }
+  }
 
 
   /*
@@ -270,16 +262,12 @@ bool wxBBIApp::OnInit( )
     {
       I->Close();
       //      std::cout << "I->Close"<<std::endl;
-    }
-  else 
+    } else
     {
       //      std::cout << "!I->Close"<<std::endl;
     }
-       
   //   std::cout << "EO OnInit"<<std::endl;
-
   return true;
-
 }
 //==========================================================================
 

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 8d814229dca69ad0cbc69fc54172a2052e7b3b6a..900876e02175757be6fe31fdba7ece6d963b6afa 100644 (file)
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -662,9 +662,6 @@ namespace bbtk
                             "=> BlackBox::bbExecute("<<(int)force<<")"
                             <<std::endl);
 
-      printf("-- EED BlackBox::bbExecute Start \n");
-      bbGlobalSetInConstruction(true);
-
     // If already executing : return
     /*
     if (bbGetExecuting()) 
@@ -700,9 +697,6 @@ namespace bbtk
                bbLetRecursiveExecuteManualMode = false;
        }
 
-      printf("-- EED BlackBox::bbExecute End \n");
-      bbGlobalSetInConstruction(false);
-         
     bbtkBlackBoxDebugMessage("process",2,
                             "<= BlackBox::bbExecute()"
                             <<std::endl);

diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx
index 451ade9e45cabbbfea1285770f41f77aa45bec28..88d05882fadb94e153e2bade7d0a898d9fff8ecc 100644 (file)
--- a/kernel/src/bbtkInterpreterVirtual.cxx
+++ b/kernel/src/bbtkInterpreterVirtual.cxx
@@ -588,8 +588,8 @@ printf("EED InterpreterVirtual::CatchUnknownException End\n");
   {
          bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
-    bool exm = mCommandLine;
-    mCommandLine = false;
+    bool exm        = mCommandLine;
+    mCommandLine    = false;
 
     try 
     {
@@ -646,7 +646,7 @@ printf("EED InterpreterVirtual::CatchUnknownException End\n");
     bbtkDebugMessage("interpreter",4,
                     "==> InterpreterVirtual::InterpretCurrentStreams()"<<std::endl);
 
-    while (mFile.size()>0) 
+    while (mFile.size()>0)
       {
        while (!mFile.back()->eof()) {
          mLine.back()++;
@@ -876,17 +876,13 @@ printf("EED InterpreterVirtual::CatchUnknownException End\n");
          {
                  commandMessage();
 //EED Borrame      mVirtualExecuter->HelpMessages();
-         }
-        else
-         {
+         }  else  {
                commandMessage(words[1],words[2]);
 //EED Borrame          sscanf(words[2].c_str(),"%d",&level);
 //EED Borrame      mVirtualExecuter->SetMessageLevel(words[1],level);
          }
        return;
-      }
-    else 
-      {
+      } else {
        bbtkMessage("echo",2,line<<std::endl);
       }
 
@@ -1993,16 +1989,16 @@ void InterpreterVirtual::SwitchToStream( std::stringstream* stream )
     oter=ter;
     ter.c_lflag &= ~ECHO;
     ter.c_lflag &= ~ICANON;
-    ter.c_cc[VMIN]=1;
-    ter.c_cc[VTIME]=0;
+    ter.c_cc[VMIN]  = 1;
+    ter.c_cc[VTIME] = 0;
     tcsetattr(0,TCSANOW,&ter);
 #endif
 
-    mCommandLine = true;
-    bool again = true;
-    // bool insideComment = false; // for multiline comment  
-    mInsideComment = false;
-    do 
+    mCommandLine    = true;
+    bool again      = true;
+    // bool insideComment = false; // for multiline comment
+    mInsideComment  = false;
+    do
     {
       try
       {

diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index 81b873c4147391495f10e23cbfe98c94cc7ce749..af131a24c980f37b9313f167a18ecdd971257a68 100644 (file)
--- a/packages/wx/src/bbwxLayoutLine.cxx
+++ b/packages/wx/src/bbwxLayoutLine.cxx
@@ -80,10 +80,7 @@ namespace bbwx
        
 void LayoutLine::Process()
 {
-    printf("EED  LayoutLine::Process start\n");
        PutWinTitle();
-    printf("EED  LayoutLine::Process end\n");
-
 }
   
        
@@ -100,9 +97,6 @@ void LayoutLine::Process()
        
   void LayoutLine::CreateWidget(wxWindow* parent)
   {
-      printf("EED   LayoutLine::CreateWidget\n");
-
-
     wxBoxSizer *sizer;
     wxPanel *w = new wxPanel(parent, -1, wxDefaultPosition, wxSize(40,40) );
     w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
@@ -164,7 +158,6 @@ void LayoutLine::Process()
   // when window is shown
   void  LayoutLine::OnShowWidget()
   {
-      printf("EED   LayoutLine::OnShowWidget\n");
       if (bbGetOutputWidget()!=NULL)
       {
           bbGetOutputWidget()->Layout();