[lmi-commits] [6051] Simplify thanks to a welcome wx enhancement

[Greg Chicares]

Revision: 6051
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6051
Author:   chicares
Date:     2014-12-06 20:04:21 +0000 (Sat, 06 Dec 2014)
Log Message:
-----------
Simplify thanks to a welcome wx enhancement

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/alert_wx.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-12-06 19:15:10 UTC (rev 6050)
+++ lmi/trunk/ChangeLog 2014-12-06 20:04:21 UTC (rev 6051)
@@ -34753,3 +34753,9 @@
 Improve title of '--help' messagebox. See:
   http://lists.nongnu.org/archive/html/lmi/2014-12/msg00013.html
 
+20141206T2004Z <address@hidden> [516]
+
+  alert_wx.cpp
+Simplify thanks to a welcome wx enhancement. See:
+  http://lists.nongnu.org/archive/html/lmi/2014-12/msg00013.html
+

Modified: lmi/trunk/alert_wx.cpp
===================================================================
--- lmi/trunk/alert_wx.cpp      2014-12-06 19:15:10 UTC (rev 6050)
+++ lmi/trunk/alert_wx.cpp      2014-12-06 20:04:21 UTC (rev 6051)
@@ -70,14 +70,7 @@
 
 void warning_alert(std::string const& s)
 {
-    if(wxTheApp && wxTheApp->GetTopWindow())
-        {
-        wxMessageBox(s, "Warning", wxOK, wxTheApp->GetTopWindow());
-        }
-    else
-        {
-        safely_show_message("Untimely warning:\n" + s);
-        }
+    wxMessageBox(s, "Warning", wxOK, wxTheApp ? wxTheApp->GetTopWindow() : 0);
 }
 
 /// It seems silly to offer an option that should never be declined,
@@ -91,15 +84,10 @@
 void hobsons_choice_alert(std::string const& s)
 {
     wxWindow* w = 0;
-    if(wxTheApp && wxTheApp->GetTopWindow())
+    if(wxTheApp)
         {
         w = wxTheApp->GetTopWindow();
         }
-    else
-        {
-        safely_show_message("Untimely error:\n" + s);
-        throw hobsons_choice_exception();
-        }
 
     if(configurable_settings::instance().offer_hobsons_choice())
         {