Correct cell alignment computation for too small column sizes.

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 3f9c2cca696b492257b153f34a2e98dd1a690ae0..b1c8838981a2473b4cfcd3fdcc6f5ef71cc5fed2 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1343,7 +1343,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
     for ( size_t n = 0; n < count; n++ )
     {
         if ( n )
     for ( size_t n = 0; n < count; n++ )
     {
         if ( n )

-            str += _T(';');
+            str += wxT(';');

 
         str += m_value[n];
     }
 
         str += m_value[n];
     }


@@ -1363,7 +1363,7 @@ bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
 
 bool wxVariantDataArrayString::Read(wxString& str)
 {
 
 bool wxVariantDataArrayString::Read(wxString& str)
 {

-    wxStringTokenizer tk(str, _T(";"));
+    wxStringTokenizer tk(str, wxT(";"));

     while ( tk.HasMoreTokens() )
     {
         m_value.Add(tk.GetNextToken());
     while ( tk.HasMoreTokens() )
     {
         m_value.Add(tk.GetNextToken());


@@ -1382,7 +1382,7 @@ wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
 
 bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
 {
 
 bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
 {

-    wxFAIL_MSG( _T("TODO") );
+    wxFAIL_MSG( wxT("TODO") );

 
     return false;
 }
 
     return false;
 }


@@ -1455,7 +1455,7 @@ protected:
 
 bool wxVariantDataLongLong::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataLongLong::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == wxS("longlong")), 
+    wxASSERT_MSG( (data.GetType() == wxS("longlong")),

                   "wxVariantDataLongLong::Eq: argument mismatch" );
 
     wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data;
                   "wxVariantDataLongLong::Eq: argument mismatch" );
 
     wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data;


@@ -1475,8 +1475,12 @@ bool wxVariantDataLongLong::Write(wxSTD ostream& str) const
 
 bool wxVariantDataLongLong::Write(wxString& str) const
 {
 
 bool wxVariantDataLongLong::Write(wxString& str) const
 {

-    str.Printf(wxS("%lld"), m_value);
+#ifdef wxLongLong_t
+    str.Printf(wxS("%lld"), m_value.GetValue());

     return true;
     return true;

+#else
+    return false;
+#endif

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -1612,7 +1616,7 @@ protected:
 
 bool wxVariantDataULongLong::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataULongLong::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == wxS("ulonglong")), 
+    wxASSERT_MSG( (data.GetType() == wxS("ulonglong")),

                   "wxVariantDataULongLong::Eq: argument mismatch" );
 
     wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data;
                   "wxVariantDataULongLong::Eq: argument mismatch" );
 
     wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data;


@@ -1632,8 +1636,12 @@ bool wxVariantDataULongLong::Write(wxSTD ostream& str) const
 
 bool wxVariantDataULongLong::Write(wxString& str) const
 {
 
 bool wxVariantDataULongLong::Write(wxString& str) const
 {

-    str.Printf(wxS("%llu"), m_value);
+#ifdef wxLongLong_t
+    str.Printf(wxS("%llu"), m_value.GetValue());

     return true;
     return true;

+#else
+    return false;
+#endif

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM