Added pango_context_get_language to speed up pango_context_get_metrics

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index e76fbcb725b3a1045fe062d3542ccd79cb4c56ff..dbf272e7e28f0951d3c1a609ddae13e995bdd709 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -20,6 +20,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.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
 #endif
 
 #if wxUSE_STD_IOSTREAM


@@ -36,13 +40,11 @@ using namespace std ;
 #endif
 
 #if wxUSE_STREAMS
 #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"
 #endif
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"

-#include "wx/math.h"

 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 


@@ -58,7 +60,7 @@ DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:
     wxVariantDataList() {}
     wxVariantDataList(const wxList& list);
 public:
     wxVariantDataList() {}
     wxVariantDataList(const wxList& list);

-    ~wxVariantDataList();
+    virtual ~wxVariantDataList();

 
     wxList& GetValue() { return m_value; }
     void SetValue(const wxList& value) ;
 
     wxList& GetValue() { return m_value; }
     void SetValue(const wxList& value) ;


@@ -983,7 +985,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
 
 bool wxVariantDataWxObjectPtr::Write(wxString& 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;
 }
 
     return true;
 }