From 9708db208d570c089b5c13948ec7e9e5e0bb5c97 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 1 Aug 2002 20:00:55 +0000 Subject: [PATCH] Applied [ 586524 ] wxVariant Enhancements. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/variant.h | 2 +- src/common/variant.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/wx/variant.h b/include/wx/variant.h index 72db3faae9..4ddfbc10fa 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -268,7 +268,7 @@ public: void ClearList(); // Implementation -protected: +public: // Type conversion bool Convert(long* value) const; bool Convert(bool* value) const; diff --git a/src/common/variant.cpp b/src/common/variant.cpp index defe41807f..48d54c7ec1 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -2244,9 +2244,11 @@ bool wxVariant::Convert(wxDateTime* value) const { wxString type(GetType()); if (type == wxT("datetime")) + { *value = ((wxVariantDataDateTime*)GetData())->GetValue(); - else - return FALSE; - - return TRUE; + return TRUE; + } + // Fallback to string conversion + wxString val; + return Convert(&val) && (value->ParseDate(val)); } -- 2.45.2