wxPickerBase derives from wxControl, not wxWindow

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 7afa1c3183f2f3ffbd274aa4017739621366f16f..06ef8faf227e71641815f8924d555940a18227eb 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -16,6 +16,16 @@
     #pragma hdrstop
 #endif
 
+#include "wx/variant.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/math.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
+#endif
+
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
@@ -30,15 +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"
-
-#include "wx/variant.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
@@ -797,7 +803,7 @@ bool wxVariantDataString::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
-    m_value = s.ReadString();
+    m_value = s.ReadLine();
     return true;
 }
 #endif // wxUSE_STREAMS
@@ -979,7 +985,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;
 }