fix printf() argument type in GetOsInfo()

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index e76fbcb725b3a1045fe062d3542ccd79cb4c56ff..06ef8faf227e71641815f8924d555940a18227eb 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)
 
@@ -983,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;
 }