SF.net SVN: mahogany:[7562] trunk/M/src/adb/ExportVCard.cpp

Revision: 7562
          http://mahogany.svn.sourceforge.net/mahogany/?rev=7562&view=rev
Author:   vadz
Date:     2009-03-29 13:05:31 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
compilation fix for latest wx svn trunk

Modified Paths:
--------------
    trunk/M/src/adb/ExportVCard.cpp

Modified: trunk/M/src/adb/ExportVCard.cpp
===================================================================
--- trunk/M/src/adb/ExportVCard.cpp	2009-03-10 02:01:32 UTC (rev 7561)
+++ trunk/M/src/adb/ExportVCard.cpp	2009-03-29 13:05:31 UTC (rev 7562)
@@ -113,9 +113,19 @@
 
    wxDateTime dt;
    entry.GetField(AdbField_Birthday, &val);
-   if ( !!val && dt.ParseDate(val) )
+   if ( !val.empty() )
    {
-      vcard.SetBirthDay(dt);
+#if wxCHECK_VERSION(2, 9, 0)
+      wxString::const_iterator end;
+      if ( dt.ParseDate(val, &end) && end == val.end() )
+#else // wx < 2.9.0
+      const char *p = dt.ParseDate(val);
+      if ( p && !*p )
+#endif // wx 2.9.0/2.8.x
+         vcard.SetBirthDay(dt);
+      else
+         wxLogWarning(_("Failed to export birthday string \"%s\" as date."),
+                      val);
    }
 
    COPY_ADB_TO_VCARD(Comments, Comment);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------