[lmi-commits] [6050] Improve title of '--help' messagebox

[Greg Chicares]

Revision: 6050
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6050
Author:   chicares
Date:     2014-12-06 19:15:10 +0000 (Sat, 06 Dec 2014)
Log Message:
-----------
Improve title of '--help' messagebox

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/main_wx_test.cpp
    lmi/trunk/skeleton.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-12-06 18:47:16 UTC (rev 6049)
+++ lmi/trunk/ChangeLog 2014-12-06 19:15:10 UTC (rev 6050)
@@ -34746,3 +34746,10 @@
 Eliminate log-message prefix. See:
   http://lists.nongnu.org/archive/html/lmi/2014-12/msg00012.html
 
+20141206T1915Z <address@hidden> [516]
+
+  main_wx_test.cpp
+  skeleton.cpp
+Improve title of '--help' messagebox. See:
+  http://lists.nongnu.org/archive/html/lmi/2014-12/msg00013.html
+

Modified: lmi/trunk/main_wx_test.cpp
===================================================================
--- lmi/trunk/main_wx_test.cpp  2014-12-06 18:47:16 UTC (rev 6049)
+++ lmi/trunk/main_wx_test.cpp  2014-12-06 19:15:10 UTC (rev 6050)
@@ -41,6 +41,7 @@
 #include <wx/fileconf.h>
 #include <wx/frame.h>
 #include <wx/init.h>                    // wxEntry()
+#include <wx/msgdlg.h>
 #include <wx/scopeguard.h>
 #include <wx/stopwatch.h>
 #include <wx/uiaction.h>
@@ -332,7 +333,8 @@
             || 0 == std::strcmp(arg, "--help")
             )
             {
-            warning()
+            std::ostringstream oss;
+            oss
                 << "Run automated GUI tests.\n"
                    "\n"
                    "Usage: "
@@ -345,7 +347,8 @@
                    "\n"
                    "Additionally, all command line options supported by the\n"
                    "main lmi executable are also supported."
-                << std::flush;
+                ;
+            wxMessageBox(oss.str(), "Command-line options");
             return false;
             }
         else

Modified: lmi/trunk/skeleton.cpp
===================================================================
--- lmi/trunk/skeleton.cpp      2014-12-06 18:47:16 UTC (rev 6049)
+++ lmi/trunk/skeleton.cpp      2014-12-06 19:15:10 UTC (rev 6050)
@@ -95,6 +95,7 @@
 #include <wx/image.h>
 #include <wx/log.h>                     // wxSafeShowMessage()
 #include <wx/menu.h>
+#include <wx/msgdlg.h>
 #include <wx/textctrl.h>
 #include <wx/textdlg.h>                 // wxGetTextFromUser()
 #include <wx/toolbar.h>
@@ -1303,8 +1304,9 @@
 
     if(show_help)
         {
-        getopt_long.usage(warning());
-        warning() << std::flush;
+        std::ostringstream oss;
+        getopt_long.usage(oss);
+        wxMessageBox(oss.str(), "Command-line options");
         return false;
         }