[lmi-commits] [5211] Anticipate an improvement in what will become wx-2.9.2

[Greg Chicares]

Revision: 5211
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5211
Author:   chicares
Date:     2011-06-20 16:15:23 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Anticipate an improvement in what will become wx-2.9.2

Modified Paths:
--------------
    skeleton/trunk/ChangeLog
    skeleton/trunk/mvc_test.cpp

Modified: skeleton/trunk/ChangeLog
===================================================================
--- skeleton/trunk/ChangeLog    2011-06-20 16:13:39 UTC (rev 5210)
+++ skeleton/trunk/ChangeLog    2011-06-20 16:15:23 UTC (rev 5211)
@@ -5116,3 +5116,15 @@
   about_dialog.cpp
 Import from lmi trunk, as required for wx-2.9 .
 
+20110620T1613Z <address@hidden> [31]
+
+  main_wx.cpp
+Return success when unit test succeeds. See:
+  http://lists.nongnu.org/archive/html/lmi/2011-06/msg00028.html
+
+20110620T1615Z <address@hidden> [31]
+
+  mvc_test.cpp
+Anticipate an improvement in what will become wx-2.9.2 . See:
+  http://lists.nongnu.org/archive/html/lmi/2011-06/msg00028.html
+

Modified: skeleton/trunk/mvc_test.cpp
===================================================================
--- skeleton/trunk/mvc_test.cpp 2011-06-20 16:13:39 UTC (rev 5210)
+++ skeleton/trunk/mvc_test.cpp 2011-06-20 16:15:23 UTC (rev 5211)
@@ -744,20 +744,20 @@
     LMI_FOCUS(birthdate);
     birthdate.SetValue(ConvertDateToWx(calendar_date(ymd_t(19560114))));
     LMI_YIELD(2, "Try to set birthdate to 19560114, one day past the upper 
limit.");
-#if wxCHECK_VERSION(2,8,0) // wx version 2.8.0 or greater.
+#if wxCHECK_VERSION(2,8,0) && !wxCHECK_VERSION(2,9,2) // 2.8.0 <= wx version < 
2.9.2 .
     LMI_TRY_TO_LOSE_FOCUS(false);
-#else  // wx prior to version 2.8.0 .
+#else  // wx prior to version 2.8.0 or later than 2.9.1 .
     LMI_TRY_TO_LOSE_FOCUS(true);
-#endif // wx prior to version 2.8.0 .
+#endif // wx prior to version 2.8.0 or later than 2.9.1 .
     LMI_ASSERT(calendar_date(ymd_t(19560113)) == as_of_date.GetValue());
     LMI_ASSERT( 0 == age.GetValue());
     LMI_ASSERT( 0 == age_minimum.GetValue());
     LMI_ASSERT(99 == age_maximum.GetValue());
-#if wxCHECK_VERSION(2,8,0) // wx version 2.8.0 or greater.
+#if wxCHECK_VERSION(2,8,0) && !wxCHECK_VERSION(2,9,2) // 2.8.0 <= wx version < 
2.9.2 .
     LMI_ASSERT(calendar_date(ymd_t(19560114)) == birthdate.GetValue());
-#else  // wx prior to version 2.8.0 .
+#else  // wx prior to version 2.8.0 or later than 2.9.1 .
     LMI_ASSERT(calendar_date(ymd_t(19560112)) == birthdate.GetValue());
-#endif // wx prior to version 2.8.0 .
+#endif // wx prior to version 2.8.0 or later than 2.9.1 .
 
     // Set birthdate to the latest possible date.
 
@@ -921,13 +921,13 @@
     LMI_FOCUS(as_of_date);
     as_of_date.SetValue(ConvertDateToWx(calendar_date(ymd_t(15821004))));
     LMI_YIELD(2, "Try to set as-of date to a value earlier than the lower 
limit.");
-#if wxCHECK_VERSION(2,8,0) // wx version 2.8.0 or greater.
+#if wxCHECK_VERSION(2,8,0) && !wxCHECK_VERSION(2,9,2) // 2.8.0 <= wx version < 
2.9.2 .
     LMI_TRY_TO_LOSE_FOCUS(false);
     LMI_ASSERT(calendar_date(ymd_t(15821004)) == as_of_date.GetValue());
-#else  // wx prior to version 2.8.0 .
+#else  // wx prior to version 2.8.0 or later than 2.9.1 .
     LMI_TRY_TO_LOSE_FOCUS(true);
     LMI_ASSERT(calendar_date(ymd_t(20010101)) == as_of_date.GetValue());
-#endif // wx prior to version 2.8.0 .
+#endif // wx prior to version 2.8.0 or later than 2.9.1 .
     LMI_ASSERT(90 == age.GetValue());
     LMI_ASSERT(10 == age_minimum.GetValue());
     LMI_ASSERT(90 == age_maximum.GetValue());