Compilo.

[wxWidgets.git] / src / common / variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index e76fbcb725b3a1045fe062d3542ccd79cb4c56ff..711f5524451cbb618b889b357562b049bbbe1fe5 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -20,6 +20,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/math.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 #endif
 
 #if wxUSE_STD_IOSTREAM
@@ -36,13 +40,11 @@ using namespace std ;
 #endif
 
 #if wxUSE_STREAMS
-#include "wx/stream.h"
-#include "wx/txtstrm.h"
+    #include "wx/txtstrm.h"
 #endif
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"
-#include "wx/math.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
@@ -58,7 +60,7 @@ DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:
     wxVariantDataList() {}
     wxVariantDataList(const wxList& list);
-    ~wxVariantDataList();
+    virtual ~wxVariantDataList();
 
     wxList& GetValue() { return m_value; }
     void SetValue(const wxList& value) ;
@@ -736,7 +738,7 @@ public:
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
+    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; };
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
@@ -780,14 +782,6 @@ bool wxVariantDataString::Write(wxString& str) const
     return true;
 }
 
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataString::Read(wxSTD istream& str)
-{
-    str >> m_value;
-    return true;
-}
-#endif
-
 #if wxUSE_STREAMS
 bool wxVariantDataString::Write(wxOutputStream& str) const
 {
@@ -983,7 +977,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
 
 bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {
-    str.Printf(wxT("%s(%p)"), GetType().c_str(), m_value);
+    str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value));
     return true;
 }
 
@@ -2106,6 +2100,6 @@ bool wxVariant::Convert(wxDateTime* value) const
     // Fallback to string conversion
     wxString val;
     return Convert(&val) &&
-                (value->ParseDateTime(val) || value->ParseDate(val));
+                (value->ParseDateTime(val) || value->ParseDate(val) || value->ParseTime(val));
 }
 #endif // wxUSE_DATETIME