X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/530ecef01f7e33c2ec1b8b1ad8025484709bef1d..89579a60d7ba7da32777647ad7647af69ec4e687:/src/common/variant.cpp?ds=inline diff --git a/src/common/variant.cpp b/src/common/variant.cpp index a45b3d7489..06ef8faf22 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -20,6 +20,7 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/math.h" #if wxUSE_STREAMS #include "wx/stream.h" #endif @@ -44,7 +45,6 @@ using namespace std ; #include "wx/string.h" #include "wx/tokenzr.h" -#include "wx/math.h" IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) @@ -985,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; }