]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix my last fix. The method is pure virtual in the base class so it
authorRobin Dunn <robin@alldunn.com>
Fri, 22 Sep 2006 22:55:55 +0000 (22:55 +0000)
committerRobin Dunn <robin@alldunn.com>
Fri, 22 Sep 2006 22:55:55 +0000 (22:55 +0000)
can't be fully removed.

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

src/common/variant.cpp

index b21b9965f27780a4936bf1b84486a764e349f037..711f5524451cbb618b889b357562b049bbbe1fe5 100644 (file)
@@ -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);