[lmi-commits] [5376] Use wxDVC only with a password never given to end users

[Greg Chicares]

Revision: 5376
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5376
Author:   chicares
Date:     2012-01-22 13:57:48 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Use wxDVC only with a password never given to end users

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-01-22 13:50:49 UTC (rev 5375)
+++ lmi/trunk/ChangeLog 2012-01-22 13:57:48 UTC (rev 5376)
@@ -29503,3 +29503,39 @@
 goal is to release a stable system while wxDVC development continues,
 but without changes like those made 20111026T1342Z and 20111028T1211Z.
 
+20120121T1144Z <address@hidden> [586]
+
+  census_view_old.cpp
+  census_view_old.hpp
+Replace defect markers in obsolescent code restored 20120121T1136Z.
+
+20120121T1300Z <address@hidden> [586]
+
+  census_view_old.cpp
+  census_view_old.hpp
+Rename class.
+
+20120121T1303Z <address@hidden> [586]
+
+  census_view_old.cpp
+Redefine a macro, out of an abundance of caution.
+
+20120122T1246Z <address@hidden> [586]
+
+  Makefile.am
+  census_document.hpp
+  multiple_cell_document.hpp
+  objects.make
+Compile and link code added 20120121T1136Z and renamed 20120121T1300Z.
+
+20120122T1350Z <address@hidden> [586]
+
+  census_document.cpp
+  census_document.hpp
+Rule out an ostensible error.
+
+20120122T1357Z <address@hidden> [586]
+
+  main_wx.cpp
+Use wxDVC only with a password never given to end users.
+

Modified: lmi/trunk/main_wx.cpp
===================================================================
--- lmi/trunk/main_wx.cpp       2012-01-22 13:50:49 UTC (rev 5375)
+++ lmi/trunk/main_wx.cpp       2012-01-22 13:57:48 UTC (rev 5376)
@@ -44,6 +44,7 @@
 #include "authenticity.hpp"
 #include "census_document.hpp"
 #include "census_view.hpp"
+#include "census_view_old.hpp"
 #include "configurable_settings.hpp"
 #include "contains.hpp"
 #include "data_directory.hpp"
@@ -332,17 +333,34 @@
     doc_manager_ = new DocManagerEx;
     doc_manager_->FileHistoryLoad(*config_);
 
-    new(wx) wxDocTemplate
-        (doc_manager_
-        ,"Census"
-        ,"*.cns"
-        ,""
-        ,"cns"
-        ,"Census document"
-        ,"Census view"
-        ,CLASSINFO(CensusDocument)
-        ,CLASSINFO(CensusView)
-        );
+    if(global_settings::instance().ash_nazg())
+        {
+        new(wx) wxDocTemplate
+            (doc_manager_
+            ,"Census"
+            ,"*.cns"
+            ,""
+            ,"cns"
+            ,"Census document"
+            ,"Census view"
+            ,CLASSINFO(CensusDocument)
+            ,CLASSINFO(CensusView)
+            );
+        }
+    else
+        {
+        new(wx) wxDocTemplate
+            (doc_manager_
+            ,"Census"
+            ,"*.cns"
+            ,""
+            ,"cns"
+            ,"Census document"
+            ,"Census view"
+            ,CLASSINFO(CensusDocument)
+            ,CLASSINFO(CensusViewOld)
+            );
+        }
 
     new(wx) wxDocTemplate
         (doc_manager_