From: Robin Dunn <robin@alldunn.com>
Date: Fri, 22 Sep 2006 22:55:55 +0000 (+0000)
Subject: Fix my last fix.  The method is pure virtual in the base class so it
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/65d48a2acf559325968922906da647b3a77eb016

Fix my last fix.  The method is pure virtual in the base class so it
can't be fully removed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index b21b9965f2..711f552445 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -219,6 +219,9 @@ public:
     virtual bool Write(wxSTD ostream& str) const;
 #endif
     virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("stringlist"); };
 
@@ -735,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);