[lmi-commits] [5247] Improve exception safety and documentation

[Greg Chicares]

Revision: 5247
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5247
Author:   chicares
Date:     2011-08-13 23:07:26 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
Improve exception safety and documentation

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/illustration_view.cpp
    lmi/trunk/mec_view.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-08-13 21:38:44 UTC (rev 5246)
+++ lmi/trunk/ChangeLog 2011-08-13 23:07:26 UTC (rev 5247)
@@ -28229,3 +28229,27 @@
   census_view.cpp
 Remove several defect markers that are now recognized as jejune.
 
+20110813T2104Z <address@hidden> [632]
+
+  Makefile.am
+  census_view.cpp
+  census_view.hpp
+  edit_mvc_docview_parameters.hpp [new file]
+  illustration_view.cpp
+  mec_view.cpp
+Unify duplicates.
+
+20110813T2138Z <address@hidden> [632]
+
+  census_view.cpp
+  illustration_view.cpp
+  mec_view.cpp
+Don't assume that x != wxID_OK implies x == wxID_CANCEL.
+
+20110813T2307Z <address@hidden> [632]
+
+  illustration_view.cpp
+  mec_view.cpp
+Improve exception safety and documentation. EditProperties() was not
+the only possible source of an exception.
+

Modified: lmi/trunk/illustration_view.cpp
===================================================================
--- lmi/trunk/illustration_view.cpp     2011-08-13 21:38:44 UTC (rev 5246)
+++ lmi/trunk/illustration_view.cpp     2011-08-13 23:07:26 UTC (rev 5247)
@@ -156,22 +156,23 @@
 
 /// This virtual function calls its base-class namesake explicitly.
 ///
-/// Trap any exception thrown by EditProperties() to ensure that this
-/// function returns 'false' on failure, lest wx's doc-view framework
-/// create a zombie view. See:
+/// Trap exceptions to ensure that this function returns 'false' on
+/// failure, lest wx's doc-view framework create a zombie view. See:
 ///   http://lists.nongnu.org/archive/html/lmi/2008-12/msg00017.html
 
 bool IllustrationView::OnCreate(wxDocument* doc, long int flags)
 {
-    if(flags & LMI_WX_CHILD_DOCUMENT)
-        {
-        is_phony_ = true;
-        return ViewEx::OnCreate(doc, flags);
-        }
+    bool has_view_been_created = false;
 
-    bool has_view_been_created = false;
     try
         {
+        if(flags & LMI_WX_CHILD_DOCUMENT)
+            {
+            is_phony_ = true;
+            has_view_been_created = ViewEx::OnCreate(doc, flags);
+            return has_view_been_created;
+            }
+
         if(wxID_CANCEL == EditProperties())
             {
             return has_view_been_created;

Modified: lmi/trunk/mec_view.cpp
===================================================================
--- lmi/trunk/mec_view.cpp      2011-08-13 21:38:44 UTC (rev 5246)
+++ lmi/trunk/mec_view.cpp      2011-08-13 23:07:26 UTC (rev 5247)
@@ -137,9 +137,8 @@
 
 /// This virtual function calls its base-class namesake explicitly.
 ///
-/// Trap any exception thrown by EditProperties() to ensure that this
-/// function returns 'false' on failure, lest wx's doc-view framework
-/// create a zombie view. See:
+/// Trap exceptions to ensure that this function returns 'false' on
+/// failure, lest wx's doc-view framework create a zombie view. See:
 ///   http://lists.nongnu.org/archive/html/lmi/2008-12/msg00017.html
 
 bool mec_view::OnCreate(wxDocument* doc, long int flags)