X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2Fbbi%2Fbbi.cxx;h=16cbb8f0b45565addc4cc3ed00180051f7e09380;hb=664e5cdbbcaf3dafa5fc9f206a7094248c289d5a;hp=a1984f5e38c532779ee274c60da67e68c1d90697;hpb=0f8f0ec85988476e9857f0091a9fc34953c1d9e6;p=bbtk.git

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index a1984f5..16cbb8f 100644
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -151,7 +151,7 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 // main frame
 bool wxBBIApp::OnInit( )
 {
-  //    std::cout << "OnInit"<<std::endl;
+  //      std::cout << "OnInit"<<std::endl;
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale
@@ -194,7 +194,7 @@ bool wxBBIApp::OnInit( )
   if (help_on_script) 
     {
       std::string package; 
-      I->GetInterpreter()->GetExecuter()->GetFactory()->HelpBlackBox("workspace",package,false);
+      I->GetInterpreter()->GetExecuter()->GetFactory()->PrintHelpDescriptor("workspace",package,false);
     }
 
   /*
@@ -202,7 +202,7 @@ bool wxBBIApp::OnInit( )
   std::cout << "con="<<console<<std::endl;
   std::cout << "iws="<<bbtk::Wx::IsSomeWindowShown()<<std::endl;
   */
-  if (!(show_on_error || cmd.console || bbtk::Wx::IsSomeWindowShown() ))
+  if (!(show_on_error || cmd.console || bbtk::Wx::IsSomeWindowAlive() ))
     {
       I->Close();
       //      std::cout << "I->Close"<<std::endl;
@@ -211,6 +211,9 @@ bool wxBBIApp::OnInit( )
     {
       //      std::cout << "!I->Close"<<std::endl;
     }
+	
+  //	std::cout << "EO OnInit"<<std::endl;
+
   return true;
 
 }
@@ -222,6 +225,7 @@ bool wxBBIApp::OnInit( )
 // WINDOWS
 //==========================================================================
 IMPLEMENT_APP(wxBBIApp);
+
 //  How to have a Console and wxWidgets
 //  http://www.wxwidgets.org/wiki/index.php/MSVC_Setup_Guide
 //   In Visual C++ 6 (7 should be similar), to create an application that is both a console application 
@@ -229,7 +233,7 @@ IMPLEMENT_APP(wxBBIApp);
 //  you need to use the linker option "/subsystem:console" and the following code:
 int main(int argc, char* argv[])
 {
-  return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
+    return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
 }
 
 #else 
@@ -241,7 +245,7 @@ IMPLEMENT_APP_NO_MAIN(wxBBIApp);
 
 
 int main(int argc, char* argv[])
-{
+{	
   wxMessageOutput::Set( new wxMessageOutputBest );
 
   wxCmdLineParser parser(cmdLineDesc,argc,argv);
@@ -277,9 +281,9 @@ int main(int argc, char* argv[])
 	{
 	  I->SetNoExecMode(false);
 	  std::string package; 
-	  I->GetExecuter()->GetFactory()->HelpBlackBox("workspace",
-						       package,
-						       false);
+	  I->GetExecuter()->GetFactory()->PrintHelpDescriptor("workspace",
+							      package,
+							      false);
 	}
       if (cmdline.input_file.size()==0)
 	I->CommandLineInterpreter();
@@ -288,27 +292,9 @@ int main(int argc, char* argv[])
     }
   else 
     {
-      //      std::cout << "main C"<<std::endl;
       wxEntry(argc, argv);
-      /*
-      // Create wxApp
-      wxBBIApp* app = new wxBBIApp();
-      app->SetCmdLine(cmdline);
-      if (wxApp::GetInstance()!=0)
-	{
-	  std::cout << "WXAPP!!!"<<std::endl;
-	}
-      //  wxApp::SetInstance(app);
-      // Start wx
-      wxInitialize();
-      std::cout << "Loop"<<std::endl;
-      app->MainLoop();
-      //bbtk::Wx::LoopUntilAllWindowsClose();
-      */
     }
 
-  std::cout << "EO main"<<std::endl;
-
 }
 
 
@@ -328,10 +314,10 @@ int main(int argc, char* argv[])
 //==========================================================================
 
 #include "bbtkInterpreter.h"
+//#include "bbtkWx.h"
 
 int main(int argc, char* argv[])
 {  
-
   if (argc>2) 
     {
       std::cout << "usage : "<<argv[0]<<" [filename]"<<std::endl;
@@ -354,7 +340,7 @@ int main(int argc, char* argv[])
       I->InterpretFile(f);
     }
   
-  bbtk::Wx::LoopUntilAllWindowsClose(); 
+  //  bbtk::Wx::LoopUntilAllWindowsClose(); 
      
   return 0;