#135 BBTK Feature New Normal - branch vtk7itk4wx3

[bbtk.git] / kernel / appli / bbi / bbi.cxx

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index 89a3daa305de477cb5ad38f819a1875e7758de05..c594a081f5d939f8e5d30948b8eb1b3b3197bd5c 100644 (file)
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -27,6 +27,8 @@
 
 #ifdef _USE_WXWIDGETS_
 
+#include <exception>
+
 //==========================================================================
 // WITH WX
 //==========================================================================
@@ -40,20 +42,43 @@
 #include <map>
 
 //==========================================================================
-// Command line options definition
-static const wxCmdLineEntryDesc cmdLineDesc[] =
-{
-  { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("print this help or help on the application defined in input bbs file if any") },
-  { wxCMD_LINE_SWITCH, _T("g"), _T("graphical-dialog"),   _T("prompt the input parameter values using graphical dialog") },
-  { wxCMD_LINE_SWITCH, _T("t"), _T("text-dialog"),   _T("prompt the input parameter values in text mode") },
-  { wxCMD_LINE_SWITCH, _T("c"), _T("console"), _T("open bbi console") },
-  { wxCMD_LINE_SWITCH, _T("N"), _T("no-console"),   _T("never open bbi console even on error") },
-  { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"),   _T("be quiet (='message max 0')") },
-  { wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("turn all messages on (='message all 9')") },
-  { wxCMD_LINE_SWITCH, _T("D"), _T("Debug"), _T("memory debug on exit (='debug -D')") },
-  { wxCMD_LINE_PARAM,  NULL, NULL, _T("file [file [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
-  { wxCMD_LINE_NONE }
-};
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+       // Command line options definition
+       static const wxCmdLineEntryDesc cmdLineDesc[] =
+       {
+         { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("print this help or help on the application defined in input bbs file if any") },
+         { wxCMD_LINE_SWITCH, _T("g"), _T("graphical-dialog"),   _T("prompt the input parameter values using graphical dialog") },
+         { wxCMD_LINE_SWITCH, _T("t"), _T("text-dialog"),   _T("prompt the input parameter values in text mode") },
+         { wxCMD_LINE_SWITCH, _T("c"), _T("console"), _T("open bbi console") },
+         { wxCMD_LINE_SWITCH, _T("N"), _T("no-console"),   _T("never open bbi console even on error") },
+         { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"),   _T("be quiet (='message max 0')") },
+         { wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("turn all messages on (='message all 9')") },
+         { wxCMD_LINE_SWITCH, _T("D"), _T("Debug"), _T("memory debug on exit (='debug -D')") },
+         { wxCMD_LINE_PARAM,  NULL, NULL, _T("file [file [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
+         { wxCMD_LINE_NONE }
+       };
+#else
+       // Command line options definition
+       static const wxCmdLineEntryDesc cmdLineDesc[] =
+       {
+         { wxCMD_LINE_SWITCH, "h", "help",   "print this help or help on the application defined in input bbs file if any" },
+         { wxCMD_LINE_SWITCH, "g", "graphical-dialog",   "prompt the input parameter values using graphical dialog" },
+         { wxCMD_LINE_SWITCH, "t", "text-dialog",   "prompt the input parameter values in text mode" },
+         { wxCMD_LINE_SWITCH, "c", "console", "open bbi console" },
+         { wxCMD_LINE_SWITCH, "N", "no-console",   "never open bbi console even on error" },
+         { wxCMD_LINE_SWITCH, "q", "quiet",   "be quiet (='message max 0')" },
+         { wxCMD_LINE_SWITCH, "d", "debug", "turn all messages on (='message all 9')" },
+         { wxCMD_LINE_SWITCH, "D", "Debug", "memory debug on exit (='debug -D')" },
+         { wxCMD_LINE_PARAM,  NULL, NULL, "file [file [...]]", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
+         { wxCMD_LINE_NONE }
+       };
+#endif
+
+
+
+
 //==========================================================================
 
 //==========================================================================
@@ -88,13 +113,20 @@ void WxProcessCmdLine::Process(wxCmdLineParser& parser)
       bbtk::StaticInitTime::PrintObjectListInfo = true;
     }
   
-  debug = ( parser.Found(_T("d")) );  
-  quiet = ( parser.Found(_T("q")) );
-  help = ( parser.Found(_T("h")) );
-  graphical_dialog = ( parser.Found(_T("wxcommandlineg")) );
-  text_dialog = ( parser.Found(_T("t")) );
-  no_console = ( parser.Found(_T("N")) );
-  
+  debug                        = ( parser.Found(_T("d")) );  
+  quiet                        = ( parser.Found(_T("q")) );
+  help                         = ( parser.Found(_T("h")) );
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+  graphical_dialog     = ( parser.Found(_T("wxcommandlineg")) );
+#else
+  printf("EED Warnning. WxProcessCmdLine::Process  g  wxcommandlineg   ");
+  graphical_dialog     = ( parser.Found(_T("g")) );
+#endif
+
+  text_dialog          = ( parser.Found(_T("t")) );
+  no_console           = ( parser.Found(_T("N")) );
   if (quiet) bbtk::MessageManager::SetMessageLevel("max",0);
   if (debug) bbtk::MessageManager::SetMessageLevel("all",9);
 
@@ -130,7 +162,7 @@ void WxProcessCmdLine::Process(wxCmdLineParser& parser)
              ((input_file.size() == 0) && 
               (!no_console) &&
               (!usage) ) );
-  
+
 }
 //==========================================================================
 
@@ -300,7 +332,7 @@ int main(int argc, char* argv[])
 
   if (!cmdline.proceed) return 0;
 
-  if (cmdline.no_console) 
+       if (cmdline.no_console) 
     {
       //      std::cout << "main NC"<<std::endl;
       // Interpreter 
@@ -313,27 +345,26 @@ int main(int argc, char* argv[])
       bool error = false;
       for (i=cmdline.input_file.begin(); 
           i!=cmdline.input_file.end(); ++i) 
-       {
-         error = ! I->InterpretFile(*i);
-         if (error) break;
-       }
-      if (help_on_script) 
-       {
-         I->SetNoExecMode(false);
-         std::string package; 
-         I->GetExecuter()->GetFactory()->PrintHelpDescriptor("workspace",
+               {
+                       error = ! I->InterpretFile(*i);
+                       if (error) break;
+               }
+       if (help_on_script) 
+               {
+                       I->SetNoExecMode(false);
+                       std::string package; 
+                       I->GetExecuter()->GetFactory()->PrintHelpDescriptor("workspace",
                                                              package,
                                                              false);
-       }
-      if (cmdline.input_file.size()==0)
-       I->CommandLineInterpreter();
-
+               }
+       if (cmdline.input_file.size()==0)
+               {
+                       I->CommandLineInterpreter();
+               } // if cmdline.input_file.size
       //
-    }
-  else 
-    {
+    } else {
       wxEntry(argc, argv);
-    }
+    } // if cmdline.no_console
 
 }